diff --git a/api.js b/api.js
index 31233f8a..d32781e2 100644
--- a/api.js
+++ b/api.js
@@ -9,575 +9,578 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 */
 
-var Auth = require("./auth.js");
-var Server = require("./server.js");
-var Logger = require("./logger.js");
+var Auth = require("./auth");
+var Logger = require("./logger");
 var apilog = new Logger.Logger("api.log");
-var Database = require("./database.js");
-var Config = require("./config.js");
-var ActionLog = require("./actionlog.js");
+var Config = require("./config");
+var ActionLog = require("./actionlog");
 var fs = require("fs");
 
-var plainHandlers = {
-    "readlog"    : handleReadLog
-};
-
-var jsonHandlers = {
-    "channeldata": handleChannelData,
-    "listloaded" : handleChannelList,
-    "login"      : handleLogin,
-    "register"   : handleRegister,
-    "changepass" : handlePasswordChange,
-    "resetpass"  : handlePasswordReset,
-    "recoverpw"  : handlePasswordRecover,
-    "setprofile" : handleProfileChange,
-    "getprofile" : handleProfileGet,
-    "setemail"   : handleEmailChange,
-    "admreports" : handleAdmReports,
-    "readactionlog" : handleReadActionLog
-};
-
-function getClientIP(req) {
-    var ip;
+function getIP(req) {
+    var raw = req.connection.remoteAddress;
     var forward = req.header("x-forwarded-for");
     if(Config.REVERSE_PROXY && forward) {
-        ip = forward.split(",")[0];
+        var ip = forward.split(",")[0];
+        Logger.syslog.log("REVPROXY " + raw + " => " + ip);
+        return ip;
     }
-    if(!ip) {
-        ip = req.connection.remoteAddress;
-    }
-    return ip;
+    return raw;
 }
 
-function handle(path, req, res) {
-    var parts = path.split("/");
-    var last = parts[parts.length - 1];
-    var params = {};
-    if(last.indexOf("?") != -1) {
-        parts[parts.length - 1] = last.substring(0, last.indexOf("?"));
-        var plist = last.substring(last.indexOf("?") + 1).split("&");
-        for(var i = 0; i < plist.length; i++) {
-            var kv = plist[i].split("=");
-            if(kv.length != 2) {
+module.exports = function (Server) {
+    return {
+        plainHandlers: {
+            "readlog"    : this.handleReadLog
+        },
+
+        jsonHandlers: {
+            "channeldata"   : this.handleChannelData,
+            "listloaded"    : this.handleChannelList,
+            "login"         : this.handleLogin,
+            "register"      : this.handleRegister,
+            "changepass"    : this.handlePasswordChange,
+            "resetpass"     : this.handlePasswordReset,
+            "recoverpw"     : this.handlePasswordRecover,
+            "setprofile"    : this.handleProfileChange,
+            "getprofile"    : this.handleProfileGet,
+            "setemail"      : this.handleEmailChange,
+            "admreports"    : this.handleAdmReports,
+            "readactionlog" : this.handleReadActionLog
+        },
+
+        handle: function (path, req, res) {
+            var parts = path.split("/");
+            var last = parts[parts.length - 1];
+            var params = {};
+            if(last.indexOf("?") != -1) {
+                parts[parts.length - 1] = last.substring(0, last.indexOf("?"));
+                var plist = last.substring(last.indexOf("?") + 1).split("&");
+                for(var i = 0; i < plist.length; i++) {
+                    var kv = plist[i].split("=");
+                    if(kv.length != 2) {
+                        res.send(400);
+                        return;
+                    }
+                    params[unescape(kv[0])] = unescape(kv[1]);
+                }
+            }
+            for(var i = 0; i < parts.length; i++) {
+                parts[i] = unescape(parts[i]);
+            }
+
+            if(parts.length != 2) {
                 res.send(400);
                 return;
             }
-            params[unescape(kv[0])] = unescape(kv[1]);
-        }
-    }
-    for(var i = 0; i < parts.length; i++) {
-        parts[i] = unescape(parts[i]);
-    }
 
-    if(parts.length != 2) {
-        res.send(400);
-        return;
-    }
-
-    if(parts[0] == "json") {
-        res.callback = params.callback || false;
-        if(!(parts[1] in jsonHandlers)) {
-            res.end(JSON.stringify({
-                error: "Unknown endpoint: " + parts[1]
-            }, null, 4));
-            return;
-        }
-        jsonHandlers[parts[1]](params, req, res);
-    }
-    else if(parts[0] == "plain") {
-        if(!(parts[1] in plainHandlers)) {
-            res.send(404);
-            return;
-        }
-        plainHandlers[parts[1]](params, req, res);
-    }
-    else {
-        res.send(400);
-    }
-}
-exports.handle = handle;
-
-function sendJSON(res, obj) {
-    var response = JSON.stringify(obj, null, 4);
-    if(res.callback) {
-        response = res.callback + "(" + response + ")";
-    }
-    var len = unescape(encodeURIComponent(response)).length;
-
-    res.setHeader("Content-Type", "application/json");
-    res.setHeader("Content-Length", len);
-    res.end(response);
-}
-
-function sendPlain(res, str) {
-    if(res.callback) {
-        str = res.callback + "('" + str + "')";
-    }
-    var len = unescape(encodeURIComponent(str)).length;
-
-    res.setHeader("Content-Type", "text/plain");
-    res.setHeader("Content-Length", len);
-    res.end(response);
-}
-
-function handleChannelData(params, req, res) {
-    var clist = params.channel || "";
-    clist = clist.split(",");
-    var data = [];
-    for(var j = 0; j < clist.length; j++) {
-        var cname = clist[j];
-        if(!cname.match(/^[a-zA-Z0-9-_]+$/)) {
-            continue;
-        }
-        var d = {
-            name: cname,
-            loaded: Server.getChannel(cname) !== undefined
-        };
-
-        if(d.loaded) {
-            var chan = Server.getChannel(cname);
-            d.pagetitle = chan.opts.pagetitle;
-            d.media = chan.playlist.current ? chan.playlist.current.media.pack() : {};
-            d.usercount = chan.users.length;
-            d.users = [];
-            for(var i = 0; i < chan.users.length; i++) {
-                if(chan.users[i].name) {
-                    d.users.push(chan.users[i].name);
+            if(parts[0] == "json") {
+                res.callback = params.callback || false;
+                if(!(parts[1] in this.jsonHandlers)) {
+                    res.end(JSON.stringify({
+                        error: "Unknown endpoint: " + parts[1]
+                    }, null, 4));
+                    return;
                 }
+                this.jsonHandlers[parts[1]](params, req, res);
             }
-            d.chat = [];
-            for(var i = 0; i < chan.chatbuffer.length; i++) {
-                d.chat.push(chan.chatbuffer[i]);
-            }
-        }
-        data.push(d);
-    }
-
-    sendJSON(res, data);
-}
-
-function handleChannelList(params, req, res) {
-    if(params.filter == "public") {
-        var all = Server.getAllChannels();
-        var clist = [];
-        for(var key in all) {
-            if(all[key].opts.show_public) {
-                clist.push(key);
-            }
-        }
-        handleChannelData({channel: clist.join(",")}, req, res);
-    }
-    var session = params.session || "";
-    var name = params.name || "";
-    var pw = params.pw || "";
-    var row = Auth.login(name, pw, session);
-    if(!row || row.global_rank < 255) {
-        res.send(403);
-        return;
-    }
-    var clist = [];
-    for(var key in Server.getAllChannels()) {
-        clist.push(key);
-    }
-    handleChannelData({channel: clist.join(",")}, req, res);
-}
-
-function handleLogin(params, req, res) {
-    var session = params.session || "";
-    var name = params.name || "";
-    var pw = params.pw || "";
-
-    if(pw == "" && session == "") {
-        if(!Auth.isRegistered(name)) {
-            sendJSON(res, {
-                success: true,
-                session: ""
-            });
-            return;
-        }
-        else {
-            sendJSON(res, {
-                success: false,
-                error: "That username is already taken"
-            });
-            return;
-        }
-    }
-
-    var row = Auth.login(name, pw, session);
-    if(row) {
-        ActionLog.record(getClientIP(req), name, "login-success");
-        sendJSON(res, {
-            success: true,
-            session: row.session_hash
-        });
-    }
-    else {
-        ActionLog.record(getClientIP(req), name, "login-failure");
-        sendJSON(res, {
-            error: "Invalid username/password",
-            success: false
-        });
-    }
-}
-
-function handlePasswordChange(params, req, res) {
-    var name = params.name || "";
-    var oldpw = params.oldpw || "";
-    var newpw = params.newpw || "";
-    if(oldpw == "" || newpw == "") {
-        sendJSON(res, {
-            success: false,
-            error: "Old password and new password cannot be empty"
-        });
-        return;
-    }
-    var row = Auth.login(name, oldpw);
-    if(row) {
-        ActionLog.record(getClientIP(req), name, "password-change");
-        var success = Auth.setUserPassword(name, newpw);
-        sendJSON(res, {
-            success: success,
-            error: success ? "" : "Change password failed",
-            session: row.session_hash
-        });
-    }
-    else {
-        sendJSON(res, {
-            success: false,
-            error: "Invalid username/password"
-        });
-    }
-}
-
-function handlePasswordReset(params, req, res) {
-    var name = params.name || "";
-    var email = unescape(params.email || "");
-    var ip = getClientIP(req);
-
-    var hash = false;
-    try {
-        hash = Database.generatePasswordReset(ip, name, email);
-        ActionLog.record(ip, name, "password-reset-generate", email);
-    }
-    catch(e) {
-        sendJSON(res, {
-            success: false,
-            error: e
-        });
-        return;
-    }
-
-    if(!Config.MAIL) {
-        sendJSON(res, {
-            success: false,
-            error: "This server does not have email enabled.  Contact an administrator"
-        });
-        return;
-    }
-    if(!email) {
-        sendJSON(res, {
-            success: false,
-            error: "You don't have a recovery email address set.  Contact an administrator"
-        });
-        return;
-    }
-    var msg = [
-        "A password reset request was issued for your account `",
-        name,
-        "` on ",
-        Config.DOMAIN,
-        ".  This request is valid for 24 hours.  ",
-        "If you did not initiate this, there is no need to take action.  ",
-        "To reset your password, copy and paste the following link into ",
-        "your browser: ",
-        Config.DOMAIN,
-        "/reset.html?",
-        hash
-    ].join("");
-
-    var mail = {
-        from: "CyTube Services <" + Config.MAIL_FROM + ">",
-        to: email,
-        subject: "Password reset request",
-        text: msg
-    };
-
-    Config.MAIL.sendMail(mail, function(err, response) {
-        if(err) {
-            Logger.errlog.log("Mail fail: " + err);
-            sendJSON(res, {
-                success: false,
-                error: "Email failed.  Contact an admin if this persists."
-            });
-        }
-        else {
-            sendJSON(res, {
-                success: true
-            });
-
-            if(Config.DEBUG) {
-                Logger.syslog.log(response);
-            }
-        }
-    });
-}
-
-function handlePasswordRecover(params, req, res) {
-    var hash = params.hash || "";
-    var ip = getClientIP(req);
-
-    try {
-        var info = Database.recoverPassword(hash);
-        sendJSON(res, {
-            success: true,
-            name: info[0],
-            pw: info[1]
-        });
-        ActionLog.record(ip, name, "password-recover-success");
-        Logger.syslog.log(ip + " recovered password for " + name);
-        return;
-    }
-    catch(e) {
-        ActionLog.record(ip, name, "password-recover-failure");
-        sendJSON(res, {
-            success: false,
-            error: e
-        });
-    }
-
-}
-
-function handleProfileGet(params, req, res) {
-    var name = params.name || "";
-
-    try {
-        var prof = Database.getProfile(name);
-        sendJSON(res, {
-            success: true,
-            profile_image: prof.profile_image,
-            profile_text: prof.profile_text
-        });
-    }
-    catch(e) {
-        sendJSON(res, {
-            success: false,
-            error: e
-        });
-    }
-}
-
-function handleProfileChange(params, req, res) {
-    var name = params.name || "";
-    var pw = params.pw || "";
-    var session = params.session || "";
-    var img = unescape(params.profile_image || "");
-    var text = unescape(params.profile_text || "");
-
-    var row = Auth.login(name, pw, session);
-    if(!row) {
-        sendJSON(res, {
-            success: false,
-            error: "Invalid login"
-        });
-        return;
-    }
-
-    var result = Database.setProfile(name, {
-        image: img,
-        text: text
-    });
-
-    sendJSON(res, {
-        success: result,
-        error: result ? "" : "Internal error.  Contact an administrator"
-    });
-
-    var all = Server.getAllChannels();
-    for(var n in all) {
-        var chan = all[n];
-        for(var i = 0; i < chan.users.length; i++) {
-            if(chan.users[i].name.toLowerCase() == name) {
-                chan.users[i].profile = {
-                    image: img,
-                    text: text
-                };
-                chan.broadcastUserUpdate(chan.users[i]);
-                break;
-            }
-        }
-    }
-}
-
-function handleEmailChange(params, req, res) {
-    var name = params.name || "";
-    var pw = params.pw || "";
-    var email = unescape(params.email) || "";
-    if(!email.match(/^[a-z0-9_\.]+@[a-z0-9_\.]+[a-z]+$/)) {
-        sendJSON(res, {
-            success: false,
-            error: "Invalid email"
-        });
-        return;
-    }
-
-    if(email.match(/.*@(localhost|127\.0\.0\.1)/i)) {
-        sendJSON(res, {
-            success: false,
-            error: "Nice try, but no."
-        });
-        return;
-    }
-
-    if(pw == "") {
-        sendJSON(res, {
-            success: false,
-            error: "Password cannot be empty"
-        });
-        return;
-    }
-    var row = Auth.login(name, pw);
-    if(row) {
-        var success = Database.setUserEmail(name, email);
-        ActionLog.record(getClientIP(req), name, "email-update", email);
-        sendJSON(res, {
-            success: success,
-            error: success ? "" : "Email update failed",
-            session: row.session_hash
-        });
-    }
-    else {
-        sendJSON(res, {
-            success: false,
-            error: "Invalid username/password"
-        });
-    }
-}
-
-function handleRegister(params, req, res) {
-    var name = params.name || "";
-    var pw = params.pw || "";
-    if(ActionLog.tooManyRegistrations(getClientIP(req))) {
-        ActionLog.record(getClientIP(req), name, "register-failure",
-            "Too many recent registrations from this IP");
-        sendJSON(res, {
-            success: false,
-            error: "Your IP address has registered several accounts in "+
-                   "the past 48 hours.  Please wait a while or ask an "+
-                   "administrator for assistance."
-        });
-        return;
-    }
-
-    if(pw == "") {
-        sendJSON(res, {
-            success: false,
-            error: "You must provide a password"
-        });
-        return;
-    }
-    else if(Auth.isRegistered(name)) {
-        ActionLog.record(getClientIP(req), name, "register-failure",
-            "Name taken");
-        sendJSON(res, {
-            success: false,
-            error: "That username is already taken"
-        });
-        return false;
-    }
-    else if(!Auth.validateName(name)) {
-        ActionLog.record(getClientIP(req), name, "register-failure",
-            "Invalid name");
-        sendJSON(res, {
-            success: false,
-            error: "Invalid username.  Usernames must be 1-20 characters long and consist only of alphanumeric characters and underscores"
-        });
-    }
-    else {
-        var session = Auth.register(name, pw);
-        if(session) {
-            ActionLog.record(getClientIP(req), name, "register-success");
-            Logger.syslog.log(getClientIP(req) + " registered " + name);
-            sendJSON(res, {
-                success: true,
-                session: session
-            });
-        }
-        else {
-            sendJSON(res, {
-                success: false,
-                error: "Registration error.  Contact an admin for assistance."
-            });
-        }
-    }
-}
-
-function handleAdmReports(params, req, res) {
-    sendJSON(res, {
-        error: "Not implemented"
-    });
-}
-
-function handleReadActionLog(params, req, res) {
-    var name = params.name || "";
-    var pw = params.pw || "";
-    var session = params.session || "";
-    var row = Auth.login(name, pw, session);
-    if(!row || row.global_rank < 255) {
-        res.send(403);
-        return;
-    }
-
-    var actions = ActionLog.readLog();
-    sendJSON(res, actions);
-}
-
-// Helper function
-function pipeLast(res, file, len) {
-    fs.stat(file, function(err, data) {
-        if(err) {
-            res.send(500);
-            return;
-        }
-        var start = data.size - len;
-        if(start < 0) {
-            start = 0;
-        }
-        var end = data.size - 1;
-        fs.createReadStream(file, {start: start, end: end}).pipe(res);
-    });
-}
-
-function handleReadLog(params, req, res) {
-    var name = params.name || "";
-    var pw = params.pw || "";
-    var session = params.session || "";
-    var row = Auth.login(name, pw, session);
-    if(!row || row.global_rank < 255) {
-        res.send(403);
-        return;
-    }
-    res.setHeader("Access-Control-Allow-Origin", "*");
-
-    var type = params.type || "";
-    if(type == "sys") {
-        pipeLast(res, "sys.log", 1024*1024);
-    }
-    else if(type == "err") {
-        pipeLast(res, "error.log", 1024*1024);
-    }
-    else if(type == "channel") {
-        var chan = params.channel || "";
-        fs.exists("chanlogs/" + chan + ".log", function(exists) {
-            if(exists) {
-                pipeLast(res, "chanlogs/" + chan + ".log", 1024*1024);
+            else if(parts[0] == "plain") {
+                if(!(parts[1] in this.plainHandlers)) {
+                    res.send(404);
+                    return;
+                }
+                this.plainHandlers[parts[1]](params, req, res);
             }
             else {
-                res.send(404);
+                res.send(400);
             }
-        });
-    }
-    else {
-        res.send(400);
-    }
+        },
+
+        sendJSON: function (res, obj) {
+            var response = JSON.stringify(obj, null, 4);
+            if(res.callback) {
+                response = res.callback + "(" + response + ")";
+            }
+            var len = unescape(encodeURIComponent(response)).length;
+
+            res.setHeader("Content-Type", "application/json");
+            res.setHeader("Content-Length", len);
+            res.end(response);
+        },
+
+        sendPlain: function (res, str) {
+            if(res.callback) {
+                str = res.callback + "('" + str + "')";
+            }
+            var len = unescape(encodeURIComponent(str)).length;
+
+            res.setHeader("Content-Type", "text/plain");
+            res.setHeader("Content-Length", len);
+            res.end(response);
+        },
+
+        handleChannelData: function (params, req, res) {
+            var clist = params.channel || "";
+            clist = clist.split(",");
+            var data = [];
+            for(var j = 0; j < clist.length; j++) {
+                var cname = clist[j];
+                if(!cname.match(/^[a-zA-Z0-9-_]+$/)) {
+                    continue;
+                }
+
+                var d = {
+                    name: cname,
+                    loaded: Server.channelLoaded(cname)
+                };
+
+                if(d.loaded) {
+                    var chan = Server.getChannel(cname);
+                    d.pagetitle = chan.opts.pagetitle;
+                    d.media = chan.playlist.current ? chan.playlist.current.media.pack() : {};
+                    d.usercount = chan.users.length;
+                    d.users = [];
+                    for(var i = 0; i < chan.users.length; i++) {
+                        if(chan.users[i].name) {
+                            d.users.push(chan.users[i].name);
+                        }
+                    }
+                    d.chat = [];
+                    for(var i = 0; i < chan.chatbuffer.length; i++) {
+                        d.chat.push(chan.chatbuffer[i]);
+                    }
+                }
+                data.push(d);
+            }
+
+            this.sendJSON(res, data);
+        },
+
+        handleChannelList: function (params, req, res) {
+            if(params.filter == "public") {
+                var all = Server.channels;
+                var clist = [];
+                for(var key in all) {
+                    if(all[key].opts.show_public) {
+                        clist.push(key);
+                    }
+                }
+                handleChannelData({channel: clist.join(",")}, req, res);
+            }
+            var session = params.session || "";
+            var name = params.name || "";
+            var pw = params.pw || "";
+            var row = Auth.login(name, pw, session);
+            if(!row || row.global_rank < 255) {
+                res.send(403);
+                return;
+            }
+            var clist = [];
+            for(var key in Server.channels) {
+                clist.push(key);
+            }
+            handleChannelData({channel: clist.join(",")}, req, res);
+        },
+
+        handleLogin: function (params, req, res) {
+            var session = params.session || "";
+            var name = params.name || "";
+            var pw = params.pw || "";
+
+            if(pw == "" && session == "") {
+                if(!Auth.isRegistered(name)) {
+                    this.sendJSON(res, {
+                        success: true,
+                        session: ""
+                    });
+                    return;
+                }
+                else {
+                    this.sendJSON(res, {
+                        success: false,
+                        error: "That username is already taken"
+                    });
+                    return;
+                }
+            }
+
+            var row = Auth.login(name, pw, session);
+            if(row) {
+                ActionLog.record(getIP(req), name, "login-success");
+                this.sendJSON(res, {
+                    success: true,
+                    session: row.session_hash
+                });
+            }
+            else {
+                ActionLog.record(getIP(req), name, "login-failure");
+                this.sendJSON(res, {
+                    error: "Invalid username/password",
+                    success: false
+                });
+            }
+        },
+
+        handlePasswordChange: function (params, req, res) {
+            var name = params.name || "";
+            var oldpw = params.oldpw || "";
+            var newpw = params.newpw || "";
+            if(oldpw == "" || newpw == "") {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Old password and new password cannot be empty"
+                });
+                return;
+            }
+            var row = Auth.login(name, oldpw);
+            if(row) {
+                ActionLog.record(getIP(req), name, "password-change");
+                var success = Auth.setUserPassword(name, newpw);
+                this.sendJSON(res, {
+                    success: success,
+                    error: success ? "" : "Change password failed",
+                    session: row.session_hash
+                });
+            }
+            else {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Invalid username/password"
+                });
+            }
+        },
+
+        handlePasswordReset: function (params, req, res) {
+            var name = params.name || "";
+            var email = unescape(params.email || "");
+            var ip = getIP(req);
+
+            var hash = false;
+            try {
+                hash = Server.db.generatePasswordReset(ip, name, email);
+                ActionLog.record(ip, name, "password-reset-generate", email);
+            }
+            catch(e) {
+                this.sendJSON(res, {
+                    success: false,
+                    error: e
+                });
+                return;
+            }
+
+            if(!Config.MAIL) {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "This server does not have email enabled.  Contact an administrator"
+                });
+                return;
+            }
+            if(!email) {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "You don't have a recovery email address set.  Contact an administrator"
+                });
+                return;
+            }
+            var msg = [
+                "A password reset request was issued for your account `",
+                name,
+                "` on ",
+                Config.DOMAIN,
+                ".  This request is valid for 24 hours.  ",
+                "If you did not initiate this, there is no need to take action.  ",
+                "To reset your password, copy and paste the following link into ",
+                "your browser: ",
+                Config.DOMAIN,
+                "/reset.html?",
+                hash
+            ].join("");
+
+            var mail = {
+                from: "CyTube Services <" + Config.MAIL_FROM + ">",
+                to: email,
+                subject: "Password reset request",
+                text: msg
+            };
+
+            Config.MAIL.sendMail(mail, function(err, response) {
+                if(err) {
+                    Logger.errlog.log("Mail fail: " + err);
+                    this.sendJSON(res, {
+                        success: false,
+                        error: "Email failed.  Contact an admin if this persists."
+                    });
+                }
+                else {
+                    this.sendJSON(res, {
+                        success: true
+                    });
+
+                    if(Config.DEBUG) {
+                        Logger.syslog.log(response);
+                    }
+                }
+            });
+        },
+
+        handlePasswordRecover: function (params, req, res) {
+            var hash = params.hash || "";
+            var ip = getIP(req);
+
+            try {
+                var info = Server.db.recoverPassword(hash);
+                this.sendJSON(res, {
+                    success: true,
+                    name: info[0],
+                    pw: info[1]
+                });
+                ActionLog.record(ip, name, "password-recover-success");
+                Logger.syslog.log(ip + " recovered password for " + name);
+                return;
+            }
+            catch(e) {
+                ActionLog.record(ip, name, "password-recover-failure");
+                this.sendJSON(res, {
+                    success: false,
+                    error: e
+                });
+            }
+        },
+
+        handleProfileGet: function (params, req, res) {
+            var name = params.name || "";
+
+            try {
+                var prof = Server.db.getProfile(name);
+                this.sendJSON(res, {
+                    success: true,
+                    profile_image: prof.profile_image,
+                    profile_text: prof.profile_text
+                });
+            }
+            catch(e) {
+                this.sendJSON(res, {
+                    success: false,
+                    error: e
+                });
+            }
+        },
+
+        handleProfileChange: function (params, req, res) {
+            var name = params.name || "";
+            var pw = params.pw || "";
+            var session = params.session || "";
+            var img = unescape(params.profile_image || "");
+            var text = unescape(params.profile_text || "");
+
+            var row = Auth.login(name, pw, session);
+            if(!row) {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Invalid login"
+                });
+                return;
+            }
+
+            var result = Server.db.setProfile(name, {
+                image: img,
+                text: text
+            });
+
+            this.sendJSON(res, {
+                success: result,
+                error: result ? "" : "Internal error.  Contact an administrator"
+            });
+
+            var all = Server.channels;
+            for(var n in all) {
+                var chan = all[n];
+                for(var i = 0; i < chan.users.length; i++) {
+                    if(chan.users[i].name.toLowerCase() == name) {
+                        chan.users[i].profile = {
+                            image: img,
+                            text: text
+                        };
+                        chan.broadcastUserUpdate(chan.users[i]);
+                        break;
+                    }
+                }
+            }
+        },
+
+        handleEmailChange: function (params, req, res) {
+            var name = params.name || "";
+            var pw = params.pw || "";
+            var email = unescape(params.email) || "";
+            // perhaps my email regex isn't perfect, but there's no freaking way
+            // I'm implementing this monstrosity:
+            // <http://www.ex-parrot.com/pdw/Mail-RFC822-Address.html>
+            if(!email.match(/^[a-z0-9_\.]+@[a-z0-9_\.]+[a-z]+$/)) {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Invalid email"
+                });
+                return;
+            }
+
+            if(email.match(/.*@(localhost|127\.0\.0\.1)/i)) {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Nice try, but no."
+                });
+                return;
+            }
+
+            if(pw == "") {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Password cannot be empty"
+                });
+                return;
+            }
+            var row = Auth.login(name, pw);
+            if(row) {
+                var success = Server.db.setUserEmail(name, email);
+                ActionLog.record(getIP(req), name, "email-update", email);
+                this.sendJSON(res, {
+                    success: success,
+                    error: success ? "" : "Email update failed",
+                    session: row.session_hash
+                });
+            }
+            else {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Invalid username/password"
+                });
+            }
+        },
+
+        handleRegister: function (params, req, res) {
+            var name = params.name || "";
+            var pw = params.pw || "";
+            if(ActionLog.tooManyRegistrations(getIP(req))) {
+                ActionLog.record(getIP(req), name, "register-failure",
+                    "Too many recent registrations from this IP");
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Your IP address has registered several accounts in "+
+                           "the past 48 hours.  Please wait a while or ask an "+
+                           "administrator for assistance."
+                });
+                return;
+            }
+
+            if(pw == "") {
+                this.sendJSON(res, {
+                    success: false,
+                    error: "You must provide a password"
+                });
+                return;
+            }
+            else if(Auth.isRegistered(name)) {
+                ActionLog.record(getIP(req), name, "register-failure",
+                    "Name taken");
+                this.sendJSON(res, {
+                    success: false,
+                    error: "That username is already taken"
+                });
+                return false;
+            }
+            else if(!Auth.validateName(name)) {
+                ActionLog.record(getIP(req), name, "register-failure",
+                    "Invalid name");
+                this.sendJSON(res, {
+                    success: false,
+                    error: "Invalid username.  Usernames must be 1-20 characters long and consist only of alphanumeric characters and underscores"
+                });
+            }
+            else {
+                var session = Auth.register(name, pw);
+                if(session) {
+                    ActionLog.record(getIP(req), name, "register-success");
+                    Logger.syslog.log(getIP(req) + " registered " + name);
+                    this.sendJSON(res, {
+                        success: true,
+                        session: session
+                    });
+                }
+                else {
+                    this.sendJSON(res, {
+                        success: false,
+                        error: "Registration error.  Contact an admin for assistance."
+                    });
+                }
+            }
+        },
+
+        handleAdmReports: function (params, req, res) {
+            this.sendJSON(res, {
+                error: "Not implemented"
+            });
+        },
+
+        handleReadActionLog: function (params, req, res) {
+            var name = params.name || "";
+            var pw = params.pw || "";
+            var session = params.session || "";
+            var row = Auth.login(name, pw, session);
+            if(!row || row.global_rank < 255) {
+                res.send(403);
+                return;
+            }
+
+            var actions = ActionLog.readLog();
+            this.sendJSON(res, actions);
+        },
+
+        // Helper function
+        pipeLast: function (res, file, len) {
+            fs.stat(file, function(err, data) {
+                if(err) {
+                    res.send(500);
+                    return;
+                }
+                var start = data.size - len;
+                if(start < 0) {
+                    start = 0;
+                }
+                var end = data.size - 1;
+                fs.createReadStream(file, {start: start, end: end}).pipe(res);
+            });
+        },
+
+        handleReadLog: function (params, req, res) {
+            var name = params.name || "";
+            var pw = params.pw || "";
+            var session = params.session || "";
+            var row = Auth.login(name, pw, session);
+            if(!row || row.global_rank < 255) {
+                res.send(403);
+                return;
+            }
+            res.setHeader("Access-Control-Allow-Origin", "*");
+
+            var type = params.type || "";
+            if(type == "sys") {
+                this.pipeLast(res, "sys.log", 1024*1024);
+            }
+            else if(type == "err") {
+                this.pipeLast(res, "error.log", 1024*1024);
+            }
+            else if(type == "channel") {
+                var chan = params.channel || "";
+                fs.exists("chanlogs/" + chan + ".log", function(exists) {
+                    if(exists) {
+                        this.pipeLast(res, "chanlogs/" + chan + ".log", 1024*1024);
+                    }
+                    else {
+                        res.send(404);
+                    }
+                });
+            }
+            else {
+                res.send(400);
+            }
+        }
+    };
 }
diff --git a/config.js b/config.js
index 3e18c403..d481bc61 100644
--- a/config.js
+++ b/config.js
@@ -9,10 +9,10 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 */
 
-exports.MYSQL_SERVER = "";
-exports.MYSQL_DB = "";
-exports.MYSQL_USER = "";
-exports.MYSQL_PASSWORD = "";
+exports.MYSQL_SERVER = "localhost";
+exports.MYSQL_DB = "syncdevel";
+exports.MYSQL_USER = "syncdevel";
+exports.MYSQL_PASSWORD = "tacky";
 exports.IO_PORT = 1337; // Socket.IO port, DO NOT USE PORT 80.
 exports.WEBSERVER_PORT = 8080; // Webserver port.  Binding port 80 requires root permissions
 exports.MAX_PER_IP = 10;
diff --git a/server.js b/server.js
index c5c27d20..139c8c3e 100644
--- a/server.js
+++ b/server.js
@@ -1,226 +1,169 @@
-/*
-The MIT License (MIT)
-Copyright (c) 2013 Calvin Montgomery
-
-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 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.
-*/
-
-const VERSION = "2.0.5";
-
-var fs = require("fs");
-var Logger = require("./logger.js");
-
-Logger.syslog.log("Starting CyTube v" + VERSION);
-var Config = require("./config.js");
 var express = require("express");
-var API = require("./api.js");
-var NWS = require("./notwebsocket");
+var Config = require("./config");
+var Logger = require("./logger");
+var Channel = require("./channel");
+var User = require("./user");
 
-var app = express();
-app.get("/r/:channel(*)", function(req, res, next) {
-    var param = req.params.channel;
-    if(!param.match(/^[a-zA-Z0-9-_]+$/)) {
-        res.redirect("/" + param);
-    }
-    else {
-        res.sendfile(__dirname + "/www/channel.html");
-    }
-});
+const VERSION = "2.1.0";
 
-app.get("/api/:apireq(*)", function(req, res, next) {
-    API.handle(req.url.substring(5), req, res);
-});
-
-function getClientIP(req) {
-    var ip = false;
+function getIP(req) {
     var raw = req.connection.remoteAddress;
     var forward = req.header("x-forwarded-for");
     if(Config.REVERSE_PROXY && forward) {
-        ip = forward.split(",")[0];
-        Logger.syslog.log("/" + ip + " is proxied by /" + raw);
+        var ip = forward.split(",")[0];
+        Logger.syslog.log("REVPROXY " + raw + " => " + ip);
         return ip;
     }
     return raw;
 }
 
-app.get("/nws/connect", function(req, res, next) {
-    var socket = NWS.newConnection(req, res);
-    var ip = getClientIP(req);
-    if(Database.checkGlobalBan(ip)) {
-        Logger.syslog.log("Disconnecting " + ip + " - bant");
-        socket.emit("kick", {
-            reason: "You're globally banned!"
-        });
-        socket.disconnect(true);
-        return;
-    }
-    socket.on("disconnect", function() {
-        exports.clients[ip]--;
-    });
-    if(!(ip in exports.clients)) {
-        exports.clients[ip] = 1;
-    }
-    else {
-        exports.clients[ip]++;
-    }
-    if(exports.clients[ip] > Config.MAX_PER_IP) {
-        socket.emit("kick", {
-            reason: "Too many connections from your IP address"
-        });
-        socket.disconnect(true);
-        return;
-    }
-    var user = new User(socket, ip);
-    Logger.syslog.log("Accepted connection from /" + user.ip);
-});
-
-app.get("/nws/:hash/:str", function(req, res, next) {
-    NWS.msgReceived(req, res);
-});
-
-app.get("/:thing(*)", function(req, res, next) {
-    res.sendfile(__dirname + "/www/" + req.params.thing);
-});
-
-app.use(function(err, req, res, next) {
-    if(404 == err.status) {
-        res.statusCode = 404;
-        res.send("Page not found");
-    }
-    else {
-        next(err);
-    }
-});
-//app.use(express.static(__dirname + "/www"));
-var httpserv = app.listen(Config.WEBSERVER_PORT);
-var ioserv = express().listen(Config.IO_PORT);
-
-exports.io = require("socket.io").listen(ioserv);
-exports.io.set("log level", 1);
-var User = require("./user.js").User;
-var Database = require("./database.js");
-Database.setup(Config);
-Database.init();
-
-var channels = {};
-exports.clients = {};
-
-fs.exists("chandump", function(exists) {
-    if(!exists) {
-        fs.mkdir("chandump", function(err) {
-            if(err)
-                Logger.errlog.log(err);
-        });
-    }
-});
-
-fs.exists("chanlogs", function(exists) {
-    if(!exists) {
-        fs.mkdir("chanlogs", function(err) {
-            if(err)
-                Logger.errlog.log(err);
-        });
-    }
-});
-
 function getSocketIP(socket) {
     var raw = socket.handshake.address.address;
     if(Config.REVERSE_PROXY) {
         if(typeof socket.handshake.headers["x-forwarded-for"] == "string") {
-            var ip = socket.handshake.headers["x-forwarded-for"].split(",")[0];
-            Logger.syslog.log("/" + ip + " is proxied by /" + raw);
+            var ip = socket.handshake.headers["x-forwarded-for"]
+                .split(",")[0];
+            Logger.syslog.log("REVPROXY " + raw + " => " + ip);
             return ip;
         }
     }
-    return socket.handshake.address.address;
+    return raw;
 }
 
-exports.io.sockets.on("connection", function(socket) {
-    var ip = getSocketIP(socket);
-    if(Database.checkGlobalBan(ip)) {
-        Logger.syslog.log("Disconnecting " + ip + " - bant");
-        socket.emit("kick", {
-            reason: "You're globally banned!"
+var Server = {
+    channels: [],
+    channelLoaded: function (name) {
+        for(var i in this.channels) {
+            if(this.channels[i].name == name)
+                return true;
+        }
+        return false;
+    },
+    getChannel: function (name) {
+        for(var i in this.channels) {
+            if(this.channels[i].name == name)
+                return this.channels[i];
+        }
+
+        var c = new Channel(name, this);
+        this.channels.push(c);
+        return c;
+    },
+    unloadChannel: function(chan) {
+        if(chan.registered)
+            chan.saveDump();
+        chan.playlist.die();
+        for(var i in this.channels) {
+            if(this.channels[i].name == chan.name) {
+                this.channels.splice(i, 1);
+                break;
+            }
+        }
+        for(var i in chan)
+            delete chan[i];
+    },
+    app: null,
+    io: null,
+    httpserv: null,
+    ioserv: null,
+    db: null,
+    ips: {},
+    init: function () {
+        this.app = express();
+        // channel path
+        this.app.get("/r/:channel(*)", function (req, res, next) {
+            var c = req.params.channel;
+            if(!c.match(/^[\w-_]+$/))
+                res.redirect("/" + c);
+            else
+                res.sendfile(__dirname + "/www/channel.html");
         });
-        socket.disconnect(true);
-        return;
-    }
-    socket.on("disconnect", function() {
-        exports.clients[ip]--;
-    });
-    if(!(ip in exports.clients)) {
-        exports.clients[ip] = 1;
-    }
-    else {
-        exports.clients[ip]++;
-    }
-    if(exports.clients[ip] > Config.MAX_PER_IP) {
-        socket.emit("kick", {
-            reason: "Too many connections from your IP address"
+
+        // api path
+        this.api = require("./api")(this);
+        this.app.get("/api/:apireq(*)", function (req, res, next) {
+            this.api.handle(req.url.substring(5), req, res);
         });
-        socket.disconnect(true);
-        return;
+
+        // default path
+        this.app.get("/:thing(*)", function (req, res, next) {
+            res.sendfile(__dirname + "/www/" + req.params.thing);
+        });
+
+        // fallback
+        this.app.use(function (err, req, res, next) {
+            if(err.status == 404) {
+                res.send(404);
+            } else {
+                next(err);
+            }
+        });
+
+        // bind servers
+        this.httpserv = this.app.listen(Config.WEBSERVER_PORT);
+        this.ioserv = express().listen(Config.IO_PORT);
+
+        // init socket.io
+        this.io = require("socket.io").listen(this.ioserv);
+        this.io.set("log level", 1);
+        this.io.sockets.on("connection", function (socket) {
+            var ip = getSocketIP(socket);
+            socket._ip = ip;
+            if(this.db.checkGlobalBan(ip)) {
+                Logger.syslog.log("Disconnecting " + ip + " - gbanned");
+                socket.emit("kick", {
+                    reason: "You're globally banned."
+                });
+                socket.disconnect(true);
+                return;
+            }
+
+            socket.on("disconnect", function () {
+                this.ips[ip]--;
+            });
+
+            if(!(ip in this.ips))
+                this.ips[ip] = 0;
+            this.ips[ip]++;
+
+            if(this.ips[ip] > Config.MAX_PER_IP) {
+                socket.emit("kick", {
+                    reason: "Too many connections from your IP address"
+                });
+                socket.disconnect(true);
+                return;
+            }
+
+            // finally a valid user
+            Logger.syslog.log("Accepted socket from /" + socket._ip);
+            new User(socket, this);
+        });
+
+        // init database
+        this.db = require("./database");
+        this.db.setup(Config);
+        this.db.init();
+    },
+    shutdown: function () {
+        Logger.syslog.log("Unloading channels");
+        for(var i in this.channels) {
+            if(this.channels[i].registered)
+                this.channels[i].saveDump();
+        }
+        Logger.syslog.log("Goodbye");
+        process.exit(0);
     }
-    var user = new User(socket, ip);
-    Logger.syslog.log("Accepted connection from /" + user.ip);
-});
+};
+
+Logger.syslog.log("Starting CyTube v" + VERSION);
+Server.init();
 
 if(!Config.DEBUG) {
-    process.on("uncaughtException", function(err) {
+    process.on("uncaughtException", function (err) {
         Logger.errlog.log("[SEVERE] Uncaught Exception: " + err);
         Logger.errlog.log(err.stack);
     });
 
-    process.on("exit", shutdown);
-    process.on("SIGINT", shutdown);
-}
-
-function shutdown() {
-    Logger.syslog.log("Unloading channels...");
-    for(var name in channels) {
-        if(channels[name].registered)
-            channels[name].saveDump();
-    }
-    Logger.syslog.log("Shutting Down");
-    process.exit(0);
-}
-
-exports.getChannel = function (name) {
-    return channels[name];
-}
-
-exports.getAllChannels = function () {
-    return channels;
-}
-
-var Channel = require("./channel.js").Channel;
-exports.createChannel = function (name) {
-    var chan = new Channel(name);
-    channels[name] = chan;
-    return chan;
-}
-
-exports.getOrCreateChannel = function (name) {
-    var chan = exports.getChannel(name);
-    if(chan !== undefined && chan.name !== undefined)
-        return chan;
-    else if(chan !== undefined && chan.name === undefined) {
-        Logger.errlog.log("Empty channel still loaded: ", name);
-        delete channels[name];
-    }
-    return exports.createChannel(name);
-}
-
-exports.unload = function(chan) {
-    if(chan.registered) {
-        chan.saveDump();
-    }
-    chan.playlist.die();
-    delete channels[chan.name];
-    for(var i in chan)
-        delete chan[i];
+    process.on("exit", Server.shutdown);
+    process.on("SIGINT", Server.shutdown);
 }