diff --git a/core/database.js b/core/database.js
index d9d20623..dbf5e688 100644
--- a/core/database.js
+++ b/core/database.js
@@ -20,8 +20,9 @@ function initializeDatabases() {
 	//	:TODO: this will need to change if more DB's are added
 	dbs.user = new sqlite3.Database(getDatabasePath('user'));
 
-	dbs.user.serialize(function onSerialized() {
+	dbs.user.serialize(function serialized() {
 		createUserTables();
+		createInitialValues();
 	});
 }
 
@@ -45,4 +46,28 @@ function createUserTables() {
 		'	FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE' + 
 		');'
 		);
+
+	dbs.user.run(
+		'CREATE TABLE IF NOT EXISTS user_group (' + 
+		'	group_id	INTEGER PRIMARY KEY,' + 
+		'	group_name	VARCHAR NOT NULL,' + 
+		'	UNIQUE(group_name)' + 
+		');'
+		);
+
+	dbs.user.run(
+		'CREATE TABLE IF NOT EXISTS user_group_member (' + 
+		'	group_id	INTEGER NOT NULL,' + 
+		'	user_id		INTEGER NOT NULL,' +
+		'	UNIQUE(group_id, user_id),' +
+		'	FOREIGN KEY(group_id) REFERENCES user_group(group_id) ON DELETE CASCADE' +
+		');'
+		);
+}
+
+function createInitialValues() {
+	dbs.user.run(
+		'INSERT OR IGNORE INTO user_group ' + 
+		'VALUES(1, "users");'
+		);
 }
\ No newline at end of file
diff --git a/core/text_view.js b/core/text_view.js
index 6fa0a29e..268bd90a 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -59,7 +59,6 @@ function TextView(options) {
 					textToDraw = textToDraw.substr(textToDraw.length - this.dimens.width, textToDraw.length);
 				}
 			} else {
-				//	:TODO: support configurable textOverflow (default="")
 				if(textToDraw.length > this.dimens.width) {
 					if(this.textOverflow && 
 						this.dimens.width > this.textOverflow.length &&
diff --git a/core/user.js b/core/user.js
index 761a59d2..2b8dd858 100644
--- a/core/user.js
+++ b/core/user.js
@@ -13,7 +13,6 @@ exports.User						= User;
 exports.getUserIdAndName			= getUserIdAndName;
 exports.createNew					= createNew;
 exports.persistAll					= persistAll;
-//exports.authenticate				= authenticate;
 
 function User() {
 	var self = this;
@@ -453,6 +452,34 @@ function loadProperties(options, cb) {
 	});
 }
 
+function loadGroups(userId, cb) {
+	//
+	//	user_group
+	//	group_id	| group_name
+	//
+	//
+	//	user_group_member
+	//	group_id	| user_id
+	//	
+	//	
+	var sql = '';
+
+	var groups = {};	//	id:name
+
+	userDb.each(sql, [ userId ], function dbRow(err, row) {
+		if(err) {
+			cb(err);
+			return;
+		} else {
+			//groups[row.group_id]
+		}
+	},
+	function complete() {
+		cb(null, groups);
+	});
+
+}
+
 /*function getProperties(userId, propNames, cb) {
 	var properties = {};
 
@@ -526,56 +553,3 @@ function persistAll(user, useTransaction, cb) {
 		}
 	);
 }
-
-/*
-function authenticate(userName, password, client, cb) {
-	assert(client);
-
-	async.waterfall(
-		[
-			function fetchUserId(callback) {
-				//	get user ID
-				getUserIdAndName(userName, function onUserId(err, userId) {
-					callback(err, userId);
-				});
-			},
-
-			function getRequiredAuthProperties(userId, callback) {
-				//	fetch properties required for authentication
-				getProperties(userId, User.StandardPropertyGroups.password, function onProps(err, props) {
-					callback(err, props);
-				});
-			},
-			function getDkWithSalt(props, callback) {
-				//	get DK from stored salt and password provided
-				generatePasswordDerivedKey(password, props.pw_pbkdf2_salt, function onDk(err, dk) {
-					callback(err, dk, props.pw_pbkdf2_dk);
-				});
-			}		
-		],
-		function validateAuth(err, passDk, propsDk) {
-			if(err) {
-				cb(err);
-			} else {
-				//
-				//	Use constant time comparison here for security feel-goods
-				//
-				var passDkBuf	= new Buffer(passDk, 'hex');
-				var propsDkBuf	= new Buffer(propsDk, 'hex');
-
-				if(passDkBuf.length !== propsDkBuf.length) {
-					cb(false);
-					return;
-				}
-
-				var c = 0;
-				for(var i = 0; i < passDkBuf.length; i++) {
-					c |= passDkBuf[i] ^ propsDkBuf[i];
-				}
-
-				cb(0 === c ? null : new Error('Invalid password'));
-			}
-		}
-	);
-}
-*/
\ No newline at end of file