diff --git a/modules/kick/commands.js b/modules/kick/commands.js
index 070dbf0..8646ff8 100644
--- a/modules/kick/commands.js
+++ b/modules/kick/commands.js
@@ -41,10 +41,13 @@ var commands = function(dbot) {
 
         // Kick and ban from all channels on the network.
         '~nban': function(event) {
+            if(!event.input) return;
+
             var server = event.server,
                 banner = event.user,
-                banee = event.input[1],
-                reason = event.input[2],
+                timeout = event.input[1],
+                banee = event.input[2],
+                reason = event.input[3],
                 adminChannel = this.config.admin_channel[event.server];
                 channels = dbot.config.servers[server].channels,
                 network = event.server;
@@ -52,108 +55,87 @@ var commands = function(dbot) {
             if(this.config.network_name[event.server]) {
                 network = this.config.network_name[event.server];
             }
+            console.log(timeout);
+            console.log(banee);
+            console.log(reason);
 
             dbot.api.nickserv.getUserHost(event.server, banee, function(host) {
                 // Add host record entry
-                if(!_.has(this.hosts, event.server)) this.hosts[event.server] = {};
-                this.hosts[event.server][banee] = host;
+                if(host) {
+                    if(!_.has(this.hosts, event.server)) this.hosts[event.server] = {};
+                    this.hosts[event.server][banee] = host;
 
-                // Create notify string
-                var notifyString = dbot.t('nbanned', {
-                    'network': network,
-                    'banner': banner,
-                    'banee': banee,
-                    'reason': reason
-                });
+                    // Create notify string
+                    /*if(!_.isUndefined(timeout)) {
+                        timeout = new Date(new Date().getTime() + (timeout * 3600000));
+                        if(!_.has(this.tempBans, event.server)) this.tempBans[event.server] = {};
+                        this.tempBans[event.server][banee] = timeout;
+                        this.internalAPI.addTempBan(event.server, banee, timeout);
+                    } else {*/
+                        var notifyString = dbot.t('nbanned', {
+                            'network': network,
+                            'banner': banner,
+                            'banee': banee,
+                            'reason': reason
+                        });
+                        var quoteString = dbot.t('nban_quote', {
+                            'banee': banee,
+                            'banner': banner,
+                            'time': new Date().toUTCString(),
+                            'reason': reason
+                        });
+                    //}
+                    console.log(notifyString);
 
-                // TODO: When this is merged into database branch, have it use the
-                //   api.quotes.addQuote function
-                if(this.config.document_bans && _.has(dbot.modules, 'quotes')) {
-                    dbot.db.quoteArrs['ban_' + banee.toLowerCase()] = [ dbot.t('nban_quote', {
-                        'banee': banee,
-                        'banner': banner,
-                        'time': new Date().toUTCString(),
-                        'reason': reason
-                    }) ];
-                    
-                    notifyString += ' ' + dbot.t('quote_recorded', { 'user': banee });
+                    // Add qutoe category documenting ban
+                    if(this.config.document_bans && _.has(dbot.modules, 'quotes')) {
+                        dbot.db.quoteArrs['ban_' + banee.toLowerCase()] = [ quoteString ];
+                        notifyString += ' ' + dbot.t('quote_recorded', { 'user': banee });
+                    }
+
+                    // Notify moderators, banee
+                    if(this.config.admin_channel[event.server]) {
+                        channels = _.without(channels, adminChannel);
+
+                        dbot.api.report.notify(server, adminChannel, notifyString);
+                        dbot.say(event.server, adminChannel, notifyString);
+
+                        dbot.say(event.server, banee, dbot.t('nbanned_notify', {
+                            'network': network,
+                            'banner': banner,
+                            'reason': reason,
+                            'admin_channel': adminChannel 
+                        }));
+                    }
+
+                    // Ban the user from all channels
+                    var i = 0;
+                    var banChannel = function(channels) {
+                        if(i >= channels.length) return;
+                        var channel = channels[i];
+                        this.api.ban(server, banee, channel);
+                        this.api.kick(server, banee, channel, reason + 
+                            ' (network-wide ban requested by ' + banner + ')');
+                        setTimeout(function() {
+                            i++; banChannel(channels);
+                        }, 1000);
+                    }.bind(this);
+                    banChannel(channels);
+                } else {
+                    event.reply(dbot.t('no_user', { 'user': banee }));
                 }
-
-                // Notify moderators, banee
-                if(this.config.admin_channel[event.server]) {
-                    channels = _.without(channels, adminChannel);
-
-                    dbot.api.report.notify(server, adminChannel, notifyString);
-                    dbot.say(event.server, adminChannel, notifyString);
-
-                    dbot.say(event.server, banee, dbot.t('nbanned_notify', {
-                        'network': network,
-                        'banner': banner,
-                        'reason': reason,
-                        'admin_channel': adminChannel 
-                    }));
-                }
-
-                // Ban the user from all channels
-                var i = 0;
-                var banChannel = function(channels) {
-                    if(i >= channels.length) return;
-                    var channel = channels[i];
-                    this.api.ban(server, banee, channel);
-                    this.api.kick(server, banee, channel, reason + 
-                        ' (network-wide ban requested by ' + banner + ')');
-                    setTimeout(function() {
-                        i++; banChannel(channels);
-                    }, 1000);
-                }.bind(this);
-                banChannel(channels);
             }.bind(this));
         },
 
         '~nunban': function(event) {
             var unbanee = event.params[1],
-                unbanner = event.user,
-                adminChannel = this.config.admin_channel[event.server],
-                channels = dbot.config.servers[event.server].channels,
-                network = event.server;
+                unbanner = event.user;
 
-            if(this.config.network_name[event.server]) {
-                network = this.config.network_name[event.server];
-            }
-
-            if(_.has(this.hosts, event.server) && _.has(this.hosts[event.server], unbanee)) {
-                var host = this.hosts[event.server][unbanee];
-
-                var notifyString = dbot.t('nunbanned', {
-                    'network': network,
-                    'unbanee': unbanee,
-                    'unbanner': unbanner
-                });
-
-                if(this.config.admin_channel[event.server]) {
-                    dbot.api.report.notify(event.server, adminChannel, notifyString);
-                    dbot.say(event.server, adminChannel, notifyString);
+            this.api.networkUnban(event.server, unbanee, unbanner, function(err) {
+                if(err) {
+                    event.reply(dbot.t('nunban_error', { 'unbanee': unbanee })); 
                 }
-
-                dbot.say(event.server, unbanee, dbot.t('nunban_notify', {
-                    'network': network,
-                    'unbanee': unbanee,
-                    'unbanner': unbanner
-                }));
-
-                var i = 0;
-                var unbanChannel = function(channels) {
-                    if(i >= channels.length) return;
-                    var channel = channels[i];
-                    this.api.unban(event.server, host, channel);
-                    setTimeout(function() {
-                        i++; unbanChannel(channels);
-                    }, 1000);
-                }.bind(this);
-                unbanChannel(channels);
-            } else {
-                event.reply(dbot.t('nunban_error', { 'unbanee': unbanee })); 
-            }
+            });
         },
 
         /*** Kick Stats ***/
@@ -214,7 +196,7 @@ var commands = function(dbot) {
     commands['~kickstats'].access = 'regular';
 
     commands['~ckick'].regex = [/^~ckick ([^ ]+) ([^ ]+) (.+)$/, 4];
-    commands['~nban'].regex = [/^~nban ([^ ]+) (.+)$/, 3];
+    commands['~nban'].regex = /^~nban ([\d^ ]+)?([^ ]+) (.+)$/;
 
     return commands;
 };
diff --git a/modules/kick/config.json b/modules/kick/config.json
index 0a52e4c..74adb04 100644
--- a/modules/kick/config.json
+++ b/modules/kick/config.json
@@ -1,5 +1,5 @@
 {
-    "dbKeys": [ "kicks", "kickers", "hosts" ],
+    "dbKeys": [ "kicks", "kickers", "hosts", "tempBans" ],
     "dependencies": [ "command", "report", "users" ],
     "help": "http://github.com/reality/depressionbot/blob/master/modules/kick/README.md",
     "ignorable": true,
diff --git a/modules/kick/kick.js b/modules/kick/kick.js
index 63f6fcb..a3cee79 100644
--- a/modules/kick/kick.js
+++ b/modules/kick/kick.js
@@ -2,6 +2,7 @@ var _ = require('underscore')._;
 
 var kick = function(dbot) {
     this.hosts = dbot.db.hosts;
+    this.tempBans = dbot.db.tempBans;
     
     this.api = {
         'ban': function(server, user, channel) {
@@ -18,6 +19,67 @@ var kick = function(dbot) {
 
         'unban': function(server, host, channel) {
             dbot.say(server, this.config.chanserv, 'unban ' + channel + ' *!*@' + host);
+        },
+
+        'networkUnban': function(server, unbanee, unbanner, callback) {
+            var channels = dbot.config.servers[server].channels,
+                network = this.config.network_name[server] || server,
+                adminChannel = this.config.admin_channel[server];
+
+            if(_.has(this.hosts, server) && _.has(this.hosts[server], unbanee)) {
+                var host = this.hosts[server][unbanee];
+
+                // Notify Staff
+                if(!_.isUndefined(adminChannel)) {
+                    var notifyString = dbot.t('nunbanned', {
+                        'network': network,
+                        'unbanee': unbanee,
+                        'unbanner': unbanner
+                    });
+                    dbot.api.report.notify(server, adminChannel, notifyString);
+                    dbot.say(server, adminChannel, notifyString);
+                }
+
+                // Notify Unbanee
+                dbot.say(server, unbanee, dbot.t('nunban_notify', {
+                    'network': network,
+                    'unbanee': unbanee,
+                    'unbanner': unbanner
+                }));
+
+                // Unban
+                var i = 0;
+                var unbanChannel = function(channels) {
+                    if(i >= channels.length) return;
+                    var channel = channels[i];
+                    this.api.unban(server, host, channel);
+                    setTimeout(function() {
+                        i++; unbanChannel(channels);
+                    }, 1000);
+                }.bind(this);
+                unbanChannel(channels);
+                
+                callback(null); // Success
+            } else {
+                // Attempt to look up the host on-the-fly
+                dbot.api.nickserv.getUserHost(server, unbanee, function(host) {
+                    if(host) {
+                        if(!_.has(this.hosts, server)) this.hosts[server] = {};
+                        this.hosts[server][unbanee] = host;
+                        this.api.networkUnban(server, unbanee, unbanner);
+                    } else {
+                        callback(true); // No host could be found
+                    }
+                });
+            }
+        }
+    };
+
+    this.internalAPI = {
+        'addTempBan': function(server, banee, timeout) {
+            dbot.api.timers.addTimeout(timeout, function() {
+            
+            });  
         }
     };
     
diff --git a/modules/kick/strings.json b/modules/kick/strings.json
index 42ec46a..55ad7df 100644
--- a/modules/kick/strings.json
+++ b/modules/kick/strings.json
@@ -38,6 +38,9 @@
         "cy": "Cafodd {banee} ei wahardd o'r rhwydwaith gan {banner} ar {time}. Y rheswm a roddwyd oedd: \"{reason}.\"",
         "de": "{banee} wurde von {banner} auf dem gesamten Netzwerk um {time} gebannt. Grund: \"{reason}.\""
     },
+    "no_user": {
+        "en": "{user} doesn't seem to be online on this server."
+    },
     "nunbanned": {
         "en": "Attention: {unbanee} has been unbanned from the {network} network by {unbanner}."
     },