From: Jack Allnutt <m2ys4u@Gmail.com>
Date: Sun, 29 Jan 2012 22:45:51 +0000 (+0000)
Subject: Tabview completely removed
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=54a2a4e1f9e0175f238af0a94fd8d015e6502ec4;p=KiwiIRC.git

Tabview completely removed

Lots of things now broken, though, however channels/member lists are stored in the model.

Joining channels works, and can see messages recieved. Need to send using /msg and own messages don't display.

However: progress!
---

diff --git a/client/index.html.jade b/client/index.html.jade
index d4c3f25..eb96042 100755
--- a/client/index.html.jade
+++ b/client/index.html.jade
@@ -110,7 +110,7 @@ html(lang="en-gb")
         - if (debug)
             script(type="text/javascript", src="/js/underscore.min.js")
             script(type="text/javascript", src="/js/util.js")
-            script(type="text/javascript", src="/js/backbone-0.5.3-min.js");
+            script(type="text/javascript", src="/js/backbone-git.js");
             script(type="text/javascript", src="/js/gateway.js")
             script(type="text/javascript", src="/js/model.js")
             script(type="text/javascript", src="/js/view.js")
diff --git a/client/js/backbone-git.js b/client/js/backbone-git.js
new file mode 100755
index 0000000..7c32137
--- /dev/null
+++ b/client/js/backbone-git.js
@@ -0,0 +1,1260 @@
+//     Backbone.js 0.5.3
+//     (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://backbonejs.org
+
+(function(){
+
+  // Initial Setup
+  // -------------
+
+  // Save a reference to the global object (`window` in the browser, `global`
+  // on the server).
+  var root = this;
+
+  // Save the previous value of the `Backbone` variable, so that it can be
+  // restored later on, if `noConflict` is used.
+  var previousBackbone = root.Backbone;
+
+  // Create a local reference to slice/splice.
+  var slice = Array.prototype.slice;
+  var splice = Array.prototype.splice;
+
+  // The top-level namespace. All public Backbone classes and modules will
+  // be attached to this. Exported for both CommonJS and the browser.
+  var Backbone;
+  if (typeof exports !== 'undefined') {
+    Backbone = exports;
+  } else {
+    Backbone = root.Backbone = {};
+  }
+
+  // Current version of the library. Keep in sync with `package.json`.
+  Backbone.VERSION = '0.5.3';
+
+  // Require Underscore, if we're on the server, and it's not already present.
+  var _ = root._;
+  if (!_ && (typeof require !== 'undefined')) _ = require('underscore');
+
+  // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
+  var $ = root.jQuery || root.Zepto || root.ender;
+
+  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
+  // to its previous owner. Returns a reference to this Backbone object.
+  Backbone.noConflict = function() {
+    root.Backbone = previousBackbone;
+    return this;
+  };
+
+  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
+  // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and
+  // set a `X-Http-Method-Override` header.
+  Backbone.emulateHTTP = false;
+
+  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
+  // `application/json` requests ... will encode the body as
+  // `application/x-www-form-urlencoded` instead and will send the model in a
+  // form param named `model`.
+  Backbone.emulateJSON = false;
+
+  // Backbone.Events
+  // -----------------
+
+  // A module that can be mixed in to *any object* in order to provide it with
+  // custom events. You may bind with `on` or remove with `off` callback functions
+  // to an event; trigger`-ing an event fires all callbacks in succession.
+  //
+  //     var object = {};
+  //     _.extend(object, Backbone.Events);
+  //     object.on('expand', function(){ alert('expanded'); });
+  //     object.trigger('expand');
+  //
+  Backbone.Events = {
+
+    // Bind an event, specified by a string name, `ev`, to a `callback`
+    // function. Passing `"all"` will bind the callback to all events fired.
+    on: function(events, callback, context) {
+      var ev;
+      events = events.split(/\s+/);
+      var calls = this._callbacks || (this._callbacks = {});
+      while (ev = events.shift()) {
+        // Create an immutable callback list, allowing traversal during
+        // modification.  The tail is an empty object that will always be used
+        // as the next node.
+        var list  = calls[ev] || (calls[ev] = {});
+        var tail = list.tail || (list.tail = list.next = {});
+        tail.callback = callback;
+        tail.context = context;
+        list.tail = tail.next = {};
+      }
+      return this;
+    },
+
+    // Remove one or many callbacks. If `context` is null, removes all callbacks
+    // with that function. If `callback` is null, removes all callbacks for the
+    // event. If `ev` is null, removes all bound callbacks for all events.
+    off: function(events, callback, context) {
+      var ev, calls, node;
+      if (!events) {
+        delete this._callbacks;
+      } else if (calls = this._callbacks) {
+        events = events.split(/\s+/);
+        while (ev = events.shift()) {
+          node = calls[ev];
+          delete calls[ev];
+          if (!callback || !node) continue;
+          // Create a new list, omitting the indicated event/context pairs.
+          while ((node = node.next) && node.next) {
+            if (node.callback === callback &&
+              (!context || node.context === context)) continue;
+            this.on(ev, node.callback, node.context);
+          }
+        }
+      }
+      return this;
+    },
+
+    // Trigger an event, firing all bound callbacks. Callbacks are passed the
+    // same arguments as `trigger` is, apart from the event name.
+    // Listening for `"all"` passes the true event name as the first argument.
+    trigger: function(events) {
+      var event, node, calls, tail, args, all, rest;
+      if (!(calls = this._callbacks)) return this;
+      all = calls['all'];
+      (events = events.split(/\s+/)).push(null);
+      // Save references to the current heads & tails.
+      while (event = events.shift()) {
+        if (all) events.push({next: all.next, tail: all.tail, event: event});
+        if (!(node = calls[event])) continue;
+        events.push({next: node.next, tail: node.tail});
+      }
+      // Traverse each list, stopping when the saved tail is reached.
+      rest = slice.call(arguments, 1);
+      while (node = events.pop()) {
+        tail = node.tail;
+        args = node.event ? [node.event].concat(rest) : rest;
+        while ((node = node.next) !== tail) {
+          node.callback.apply(node.context || this, args);
+        }
+      }
+      return this;
+    }
+
+  };
+
+  // Aliases for backwards compatibility.
+  Backbone.Events.bind   = Backbone.Events.on;
+  Backbone.Events.unbind = Backbone.Events.off;
+
+  // Backbone.Model
+  // --------------
+
+  // Create a new model, with defined attributes. A client id (`cid`)
+  // is automatically generated and assigned for you.
+  Backbone.Model = function(attributes, options) {
+    var defaults;
+    attributes || (attributes = {});
+    if (options && options.parse) attributes = this.parse(attributes);
+    if (defaults = getValue(this, 'defaults')) {
+      attributes = _.extend({}, defaults, attributes);
+    }
+    if (options && options.collection) this.collection = options.collection;
+    this.attributes = {};
+    this._escapedAttributes = {};
+    this.cid = _.uniqueId('c');
+    if (!this.set(attributes, {silent: true})) {
+      throw new Error("Can't create an invalid model");
+    }
+    this._changed = false;
+    this._previousAttributes = _.clone(this.attributes);
+    this.initialize.apply(this, arguments);
+  };
+
+  // Attach all inheritable methods to the Model prototype.
+  _.extend(Backbone.Model.prototype, Backbone.Events, {
+
+    // Has the item been changed since the last `"change"` event?
+    _changed: false,
+
+    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
+    // CouchDB users may want to set this to `"_id"`.
+    idAttribute: 'id',
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Return a copy of the model's `attributes` object.
+    toJSON: function() {
+      return _.clone(this.attributes);
+    },
+
+    // Get the value of an attribute.
+    get: function(attr) {
+      return this.attributes[attr];
+    },
+
+    // Get the HTML-escaped value of an attribute.
+    escape: function(attr) {
+      var html;
+      if (html = this._escapedAttributes[attr]) return html;
+      var val = this.attributes[attr];
+      return this._escapedAttributes[attr] = _.escape(val == null ? '' : '' + val);
+    },
+
+    // Returns `true` if the attribute contains a value that is not null
+    // or undefined.
+    has: function(attr) {
+      return this.attributes[attr] != null;
+    },
+
+    // Set a hash of model attributes on the object, firing `"change"` unless
+    // you choose to silence it.
+    set: function(key, value, options) {
+      var attrs, attr, val;
+      if (_.isObject(key) || key == null) {
+        attrs = key;
+        options = value;
+      } else {
+        attrs = {};
+        attrs[key] = value;
+      }
+
+      // Extract attributes and options.
+      options || (options = {});
+      if (!attrs) return this;
+      if (attrs instanceof Backbone.Model) attrs = attrs.attributes;
+      if (options.unset) for (var attr in attrs) attrs[attr] = void 0;
+      var now = this.attributes, escaped = this._escapedAttributes;
+
+      // Run validation.
+      if (this.validate && !this._performValidation(attrs, options)) return false;
+
+      // Check for changes of `id`.
+      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
+
+      // We're about to start triggering change events.
+      var alreadyChanging = this._changing;
+      this._changing = true;
+
+      // Update attributes.
+      var changes = {};
+      for (attr in attrs) {
+        val = attrs[attr];
+        if (!_.isEqual(now[attr], val) || (options.unset && (attr in now))) {
+          delete escaped[attr];
+          this._changed = true;
+          changes[attr] = val;
+        }
+        options.unset ? delete now[attr] : now[attr] = val;
+      }
+
+      // Fire `change:attribute` events.
+      for (var attr in changes) {
+        if (!options.silent) this.trigger('change:' + attr, this, changes[attr], options);
+      }
+
+      // Fire the `"change"` event, if the model has been changed.
+      if (!alreadyChanging) {
+        if (!options.silent && this._changed) this.change(options);
+        this._changing = false;
+      }
+      return this;
+    },
+
+    // Remove an attribute from the model, firing `"change"` unless you choose
+    // to silence it. `unset` is a noop if the attribute doesn't exist.
+    unset: function(attr, options) {
+      (options || (options = {})).unset = true;
+      return this.set(attr, null, options);
+    },
+
+    // Clear all attributes on the model, firing `"change"` unless you choose
+    // to silence it.
+    clear: function(options) {
+      (options || (options = {})).unset = true;
+      return this.set(_.clone(this.attributes), options);
+    },
+
+    // Fetch the model from the server. If the server's representation of the
+    // model differs from its current attributes, they will be overriden,
+    // triggering a `"change"` event.
+    fetch: function(options) {
+      options = options ? _.clone(options) : {};
+      var model = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        if (!model.set(model.parse(resp, xhr), options)) return false;
+        if (success) success(model, resp);
+      };
+      options.error = Backbone.wrapError(options.error, model, options);
+      return (this.sync || Backbone.sync).call(this, 'read', this, options);
+    },
+
+    // Set a hash of model attributes, and sync the model to the server.
+    // If the server returns an attributes hash that differs, the model's
+    // state will be `set` again.
+    save: function(key, value, options) {
+      var attrs;
+      if (_.isObject(key) || key == null) {
+        attrs = key;
+        options = value;
+      } else {
+        attrs = {};
+        attrs[key] = value;
+      }
+
+      options = options ? _.clone(options) : {};
+      if (attrs && !this[options.wait ? '_performValidation' : 'set'](attrs, options)) return false;
+      var model = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        var serverAttrs = model.parse(resp, xhr);
+        if (options.wait) serverAttrs = _.extend(attrs || {}, serverAttrs);
+        if (!model.set(serverAttrs, options)) return false;
+        if (success) {
+          success(model, resp);
+        } else {
+          model.trigger('sync', model, resp, options);
+        }
+      };
+      options.error = Backbone.wrapError(options.error, model, options);
+      var method = this.isNew() ? 'create' : 'update';
+      return (this.sync || Backbone.sync).call(this, method, this, options);
+    },
+
+    // Destroy this model on the server if it was already persisted.
+    // Optimistically removes the model from its collection, if it has one.
+    // If `wait: true` is passed, waits for the server to respond before removal.
+    destroy: function(options) {
+      options = options ? _.clone(options) : {};
+      var model = this;
+      var success = options.success;
+
+      var triggerDestroy = function() {
+        model.trigger('destroy', model, model.collection, options);
+      };
+
+      if (this.isNew()) return triggerDestroy();
+      options.success = function(resp) {
+        if (options.wait) triggerDestroy();
+        if (success) {
+          success(model, resp);
+        } else {
+          model.trigger('sync', model, resp, options);
+        }
+      };
+      options.error = Backbone.wrapError(options.error, model, options);
+      var xhr = (this.sync || Backbone.sync).call(this, 'delete', this, options);
+      if (!options.wait) triggerDestroy();
+      return xhr;
+    },
+
+    // Default URL for the model's representation on the server -- if you're
+    // using Backbone's restful methods, override this to change the endpoint
+    // that will be called.
+    url: function() {
+      var base = getValue(this.collection, 'url') || getValue(this, 'urlRoot') || urlError();
+      if (this.isNew()) return base;
+      return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
+    },
+
+    // **parse** converts a response into the hash of attributes to be `set` on
+    // the model. The default implementation is just to pass the response along.
+    parse: function(resp, xhr) {
+      return resp;
+    },
+
+    // Create a new model with identical attributes to this one.
+    clone: function() {
+      return new this.constructor(this.attributes);
+    },
+
+    // A model is new if it has never been saved to the server, and lacks an id.
+    isNew: function() {
+      return this.id == null;
+    },
+
+    // Call this method to manually fire a `change` event for this model.
+    // Calling this will cause all objects observing the model to update.
+    change: function(options) {
+      this.trigger('change', this, options);
+      this._previousAttributes = _.clone(this.attributes);
+      this._changed = false;
+    },
+
+    // Determine if the model has changed since the last `"change"` event.
+    // If you specify an attribute name, determine if that attribute has changed.
+    hasChanged: function(attr) {
+      if (attr) return !_.isEqual(this._previousAttributes[attr], this.attributes[attr]);
+      return this._changed;
+    },
+
+    // Return an object containing all the attributes that have changed, or
+    // false if there are no changed attributes. Useful for determining what
+    // parts of a view need to be updated and/or what attributes need to be
+    // persisted to the server. Unset attributes will be set to undefined.
+    changedAttributes: function(now) {
+      if (!this._changed) return false;
+      now || (now = this.attributes);
+      var changed = false, old = this._previousAttributes;
+      for (var attr in now) {
+        if (_.isEqual(old[attr], now[attr])) continue;
+        (changed || (changed = {}))[attr] = now[attr];
+      }
+      for (var attr in old) {
+        if (!(attr in now)) (changed || (changed = {}))[attr] = void 0;
+      }
+      return changed;
+    },
+
+    // Get the previous value of an attribute, recorded at the time the last
+    // `"change"` event was fired.
+    previous: function(attr) {
+      if (!attr || !this._previousAttributes) return null;
+      return this._previousAttributes[attr];
+    },
+
+    // Get all of the attributes of the model at the time of the previous
+    // `"change"` event.
+    previousAttributes: function() {
+      return _.clone(this._previousAttributes);
+    },
+
+    // Run validation against a set of incoming attributes, returning `true`
+    // if all is well. If a specific `error` callback has been passed,
+    // call that instead of firing the general `"error"` event.
+    _performValidation: function(attrs, options) {
+      var newAttrs = _.extend({}, this.attributes, attrs);
+      var error = this.validate(newAttrs, options);
+      if (error) {
+        if (options.error) {
+          options.error(this, error, options);
+        } else {
+          this.trigger('error', this, error, options);
+        }
+        return false;
+      }
+      return true;
+    }
+
+  });
+
+  // Backbone.Collection
+  // -------------------
+
+  // Provides a standard collection class for our sets of models, ordered
+  // or unordered. If a `comparator` is specified, the Collection will maintain
+  // its models in sort order, as they're added and removed.
+  Backbone.Collection = function(models, options) {
+    options || (options = {});
+    if (options.comparator) this.comparator = options.comparator;
+    this._reset();
+    this.initialize.apply(this, arguments);
+    if (models) this.reset(models, {silent: true, parse: options.parse});
+  };
+
+  // Define the Collection's inheritable methods.
+  _.extend(Backbone.Collection.prototype, Backbone.Events, {
+
+    // The default model for a collection is just a **Backbone.Model**.
+    // This should be overridden in most cases.
+    model: Backbone.Model,
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // The JSON representation of a Collection is an array of the
+    // models' attributes.
+    toJSON: function() {
+      return this.map(function(model){ return model.toJSON(); });
+    },
+
+    // Add a model, or list of models to the set. Pass **silent** to avoid
+    // firing the `add` event for every new model.
+    add: function(models, options) {
+      var i, index, length, model, cids = {};
+      options || (options = {});
+      models = _.isArray(models) ? models.slice() : [models];
+
+      // Begin by turning bare objects into model references, and preventing
+      // invalid models or duplicate models from being added.
+      for (i = 0, length = models.length; i < length; i++) {
+        if (!(model = models[i] = this._prepareModel(models[i], options))) {
+          throw new Error("Can't add an invalid model to a collection");
+        }
+        var hasId = model.id != null;
+        if (this._byCid[model.cid] || (hasId && this._byId[model.id])) {
+          throw new Error("Can't add the same model to a collection twice");
+        }
+      }
+
+      // Listen to added models' events, and index models for lookup by
+      // `id` and by `cid`.
+      for (i = 0; i < length; i++) {
+        (model = models[i]).on('all', this._onModelEvent, this);
+        this._byCid[model.cid] = model;
+        if (model.id != null) this._byId[model.id] = model;
+        cids[model.cid] = true;
+      }
+
+      // Insert models into the collection, re-sorting if needed, and triggering
+      // `add` events unless silenced.
+      this.length += length;
+      index = options.at != null ? options.at : this.models.length;
+      splice.apply(this.models, [index, 0].concat(models));
+      if (this.comparator) this.sort({silent: true});
+      if (options.silent) return this;
+      for (i = 0, length = this.models.length; i < length; i++) {
+        if (!cids[(model = this.models[i]).cid]) continue;
+        options.index = i;
+        model.trigger('add', model, this, options);
+      }
+      return this;
+    },
+
+    // Remove a model, or a list of models from the set. Pass silent to avoid
+    // firing the `remove` event for every model removed.
+    remove: function(models, options) {
+      var i, l, index, model;
+      options || (options = {});
+      models = _.isArray(models) ? models.slice() : [models];
+      for (i = 0, l = models.length; i < l; i++) {
+        model = this.getByCid(models[i]) || this.get(models[i]);
+        if (!model) continue;
+        delete this._byId[model.id];
+        delete this._byCid[model.cid];
+        index = this.indexOf(model);
+        this.models.splice(index, 1);
+        this.length--;
+        if (!options.silent) {
+          options.index = index;
+          model.trigger('remove', model, this, options);
+        }
+        this._removeReference(model);
+      }
+      return this;
+    },
+
+    // Get a model from the set by id.
+    get: function(id) {
+      if (id == null) return null;
+      return this._byId[id.id != null ? id.id : id];
+    },
+
+    // Get a model from the set by client id.
+    getByCid: function(cid) {
+      return cid && this._byCid[cid.cid || cid];
+    },
+
+    // Get the model at the given index.
+    at: function(index) {
+      return this.models[index];
+    },
+
+    // Force the collection to re-sort itself. You don't need to call this under
+    // normal circumstances, as the set will maintain sort order as each item
+    // is added.
+    sort: function(options) {
+      options || (options = {});
+      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
+      var boundComparator = _.bind(this.comparator, this);
+      if (this.comparator.length == 1) {
+        this.models = this.sortBy(boundComparator);
+      } else {
+        this.models.sort(boundComparator);
+      }
+      if (!options.silent) this.trigger('reset', this, options);
+      return this;
+    },
+
+    // Pluck an attribute from each model in the collection.
+    pluck: function(attr) {
+      return _.map(this.models, function(model){ return model.get(attr); });
+    },
+
+    // When you have more items than you want to add or remove individually,
+    // you can reset the entire set with a new list of models, without firing
+    // any `add` or `remove` events. Fires `reset` when finished.
+    reset: function(models, options) {
+      models  || (models = []);
+      options || (options = {});
+      for (var i = 0, l = this.models.length; i < l; i++) {
+        this._removeReference(this.models[i]);
+      }
+      this._reset();
+      this.add(models, {silent: true, parse: options.parse});
+      if (!options.silent) this.trigger('reset', this, options);
+      return this;
+    },
+
+    // Fetch the default set of models for this collection, resetting the
+    // collection when they arrive. If `add: true` is passed, appends the
+    // models to the collection instead of resetting.
+    fetch: function(options) {
+      options = options ? _.clone(options) : {};
+      if (options.parse === undefined) options.parse = true;
+      var collection = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
+        if (success) success(collection, resp);
+      };
+      options.error = Backbone.wrapError(options.error, collection, options);
+      return (this.sync || Backbone.sync).call(this, 'read', this, options);
+    },
+
+    // Create a new instance of a model in this collection. Add the model to the
+    // collection immediately, unless `wait: true` is passed, in which case we
+    // wait for the server to agree.
+    create: function(model, options) {
+      var coll = this;
+      options = options ? _.clone(options) : {};
+      model = this._prepareModel(model, options);
+      if (!model) return false;
+      if (!options.wait) coll.add(model, options);
+      var success = options.success;
+      options.success = function(nextModel, resp, xhr) {
+        if (options.wait) coll.add(nextModel, options);
+        if (success) {
+          success(nextModel, resp);
+        } else {
+          nextModel.trigger('sync', model, resp, options);
+        }
+      };
+      model.save(null, options);
+      return model;
+    },
+
+    // **parse** converts a response into a list of models to be added to the
+    // collection. The default implementation is just to pass it through.
+    parse: function(resp, xhr) {
+      return resp;
+    },
+
+    // Proxy to _'s chain. Can't be proxied the same way the rest of the
+    // underscore methods are proxied because it relies on the underscore
+    // constructor.
+    chain: function () {
+      return _(this.models).chain();
+    },
+
+    // Reset all internal state. Called when the collection is reset.
+    _reset: function(options) {
+      this.length = 0;
+      this.models = [];
+      this._byId  = {};
+      this._byCid = {};
+    },
+
+    // Prepare a model or hash of attributes to be added to this collection.
+    _prepareModel: function(model, options) {
+      if (!(model instanceof Backbone.Model)) {
+        var attrs = model;
+        options.collection = this;
+        model = new this.model(attrs, options);
+        if (model.validate && !model._performValidation(model.attributes, options)) model = false;
+      } else if (!model.collection) {
+        model.collection = this;
+      }
+      return model;
+    },
+
+    // Internal method to remove a model's ties to a collection.
+    _removeReference: function(model) {
+      if (this == model.collection) {
+        delete model.collection;
+      }
+      model.off('all', this._onModelEvent, this);
+    },
+
+    // Internal method called every time a model in the set fires an event.
+    // Sets need to update their indexes when models change ids. All other
+    // events simply proxy through. "add" and "remove" events that originate
+    // in other collections are ignored.
+    _onModelEvent: function(ev, model, collection, options) {
+      if ((ev == 'add' || ev == 'remove') && collection != this) return;
+      if (ev == 'destroy') {
+        this.remove(model, options);
+      }
+      if (model && ev === 'change:' + model.idAttribute) {
+        delete this._byId[model.previous(model.idAttribute)];
+        this._byId[model.id] = model;
+      }
+      this.trigger.apply(this, arguments);
+    }
+
+  });
+
+  // Underscore methods that we want to implement on the Collection.
+  var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find',
+    'detect', 'filter', 'select', 'reject', 'every', 'all', 'some', 'any',
+    'include', 'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex',
+    'toArray', 'size', 'first', 'initial', 'rest', 'last', 'without', 'indexOf',
+    'shuffle', 'lastIndexOf', 'isEmpty', 'groupBy'];
+
+  // Mix in each Underscore method as a proxy to `Collection#models`.
+  _.each(methods, function(method) {
+    Backbone.Collection.prototype[method] = function() {
+      return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
+    };
+  });
+
+  // Backbone.Router
+  // -------------------
+
+  // Routers map faux-URLs to actions, and fire events when routes are
+  // matched. Creating a new one sets its `routes` hash, if not set statically.
+  Backbone.Router = function(options) {
+    options || (options = {});
+    if (options.routes) this.routes = options.routes;
+    this._bindRoutes();
+    this.initialize.apply(this, arguments);
+  };
+
+  // Cached regular expressions for matching named param parts and splatted
+  // parts of route strings.
+  var namedParam    = /:\w+/g;
+  var splatParam    = /\*\w+/g;
+  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
+
+  // Set up all inheritable **Backbone.Router** properties and methods.
+  _.extend(Backbone.Router.prototype, Backbone.Events, {
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Manually bind a single named route to a callback. For example:
+    //
+    //     this.route('search/:query/p:num', 'search', function(query, num) {
+    //       ...
+    //     });
+    //
+    route: function(route, name, callback) {
+      Backbone.history || (Backbone.history = new Backbone.History);
+      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
+      if (!callback) callback = this[name];
+      Backbone.history.route(route, _.bind(function(fragment) {
+        var args = this._extractParameters(route, fragment);
+        callback && callback.apply(this, args);
+        this.trigger.apply(this, ['route:' + name].concat(args));
+        Backbone.history.trigger('route', this, name, args);
+      }, this));
+    },
+
+    // Simple proxy to `Backbone.history` to save a fragment into the history.
+    navigate: function(fragment, options) {
+      Backbone.history.navigate(fragment, options);
+    },
+
+    // Bind all defined routes to `Backbone.history`. We have to reverse the
+    // order of the routes here to support behavior where the most general
+    // routes can be defined at the bottom of the route map.
+    _bindRoutes: function() {
+      if (!this.routes) return;
+      var routes = [];
+      for (var route in this.routes) {
+        routes.unshift([route, this.routes[route]]);
+      }
+      for (var i = 0, l = routes.length; i < l; i++) {
+        this.route(routes[i][0], routes[i][1], this[routes[i][1]]);
+      }
+    },
+
+    // Convert a route string into a regular expression, suitable for matching
+    // against the current location hash.
+    _routeToRegExp: function(route) {
+      route = route.replace(escapeRegExp, '\\$&')
+                   .replace(namedParam, '([^\/]+)')
+                   .replace(splatParam, '(.*?)');
+      return new RegExp('^' + route + '$');
+    },
+
+    // Given a route, and a URL fragment that it matches, return the array of
+    // extracted parameters.
+    _extractParameters: function(route, fragment) {
+      return route.exec(fragment).slice(1);
+    }
+
+  });
+
+  // Backbone.History
+  // ----------------
+
+  // Handles cross-browser history management, based on URL fragments. If the
+  // browser does not support `onhashchange`, falls back to polling.
+  Backbone.History = function() {
+    this.handlers = [];
+    _.bindAll(this, 'checkUrl');
+  };
+
+  // Cached regex for cleaning leading hashes and slashes .
+  var routeStripper = /^[#\/]/;
+
+  // Cached regex for detecting MSIE.
+  var isExplorer = /msie [\w.]+/;
+
+  // Has the history handling already been started?
+  var historyStarted = false;
+
+  // Set up all inheritable **Backbone.History** properties and methods.
+  _.extend(Backbone.History.prototype, Backbone.Events, {
+
+    // The default interval to poll for hash changes, if necessary, is
+    // twenty times a second.
+    interval: 50,
+
+    // Get the cross-browser normalized URL fragment, either from the URL,
+    // the hash, or the override.
+    getFragment: function(fragment, forcePushState) {
+      if (fragment == null) {
+        if (this._hasPushState || forcePushState) {
+          fragment = window.location.pathname;
+          var search = window.location.search;
+          if (search) fragment += search;
+        } else {
+          fragment = window.location.hash;
+        }
+      }
+      fragment = decodeURIComponent(fragment.replace(routeStripper, ''));
+      if (!fragment.indexOf(this.options.root)) fragment = fragment.substr(this.options.root.length);
+      return fragment;
+    },
+
+    // Start the hash change handling, returning `true` if the current URL matches
+    // an existing route, and `false` otherwise.
+    start: function(options) {
+
+      // Figure out the initial configuration. Do we need an iframe?
+      // Is pushState desired ... is it available?
+      if (historyStarted) throw new Error("Backbone.history has already been started");
+      this.options          = _.extend({}, {root: '/'}, this.options, options);
+      this._wantsHashChange = this.options.hashChange !== false;
+      this._wantsPushState  = !!this.options.pushState;
+      this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
+      var fragment          = this.getFragment();
+      var docMode           = document.documentMode;
+      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
+      if (oldIE) {
+        this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
+        this.navigate(fragment);
+      }
+
+      // Depending on whether we're using pushState or hashes, and whether
+      // 'onhashchange' is supported, determine how we check the URL state.
+      if (this._hasPushState) {
+        $(window).bind('popstate', this.checkUrl);
+      } else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) {
+        $(window).bind('hashchange', this.checkUrl);
+      } else if (this._wantsHashChange) {
+        this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
+      }
+
+      // Determine if we need to change the base url, for a pushState link
+      // opened by a non-pushState browser.
+      this.fragment = fragment;
+      historyStarted = true;
+      var loc = window.location;
+      var atRoot  = loc.pathname == this.options.root;
+
+      // If we've started off with a route from a `pushState`-enabled browser,
+      // but we're currently in a browser that doesn't support it...
+      if (this._wantsHashChange && this._wantsPushState && !this._hasPushState && !atRoot) {
+        this.fragment = this.getFragment(null, true);
+        window.location.replace(this.options.root + '#' + this.fragment);
+        // Return immediately as browser will do redirect to new url
+        return true;
+
+      // Or if we've started out with a hash-based route, but we're currently
+      // in a browser where it could be `pushState`-based instead...
+      } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
+        this.fragment = loc.hash.replace(routeStripper, '');
+        window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
+      }
+
+      if (!this.options.silent) {
+        return this.loadUrl();
+      }
+    },
+
+    // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
+    // but possibly useful for unit testing Routers.
+    stop: function() {
+      $(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
+      clearInterval(this._checkUrlInterval);
+      historyStarted = false;
+    },
+
+    // Add a route to be tested when the fragment changes. Routes added later
+    // may override previous routes.
+    route: function(route, callback) {
+      this.handlers.unshift({route: route, callback: callback});
+    },
+
+    // Checks the current URL to see if it has changed, and if it has,
+    // calls `loadUrl`, normalizing across the hidden iframe.
+    checkUrl: function(e) {
+      var current = this.getFragment();
+      if (current == this.fragment && this.iframe) current = this.getFragment(this.iframe.location.hash);
+      if (current == this.fragment || current == decodeURIComponent(this.fragment)) return false;
+      if (this.iframe) this.navigate(current);
+      this.loadUrl() || this.loadUrl(window.location.hash);
+    },
+
+    // Attempt to load the current URL fragment. If a route succeeds with a
+    // match, returns `true`. If no defined routes matches the fragment,
+    // returns `false`.
+    loadUrl: function(fragmentOverride) {
+      var fragment = this.fragment = this.getFragment(fragmentOverride);
+      var matched = _.any(this.handlers, function(handler) {
+        if (handler.route.test(fragment)) {
+          handler.callback(fragment);
+          return true;
+        }
+      });
+      return matched;
+    },
+
+    // Save a fragment into the hash history, or replace the URL state if the
+    // 'replace' option is passed. You are responsible for properly URL-encoding
+    // the fragment in advance.
+    //
+    // The options object can contain `trigger: true` if you wish to have the
+    // route callback be fired (not usually desirable), or `replace: true`, if
+    // you which to modify the current URL without adding an entry to the history.
+    navigate: function(fragment, options) {
+      if (!historyStarted) return false;
+      if (!options || options === true) options = {trigger: options};
+      var frag = (fragment || '').replace(routeStripper, '');
+      if (this.fragment == frag || this.fragment == decodeURIComponent(frag)) return;
+
+      // If pushState is available, we use it to set the fragment as a real URL.
+      if (this._hasPushState) {
+        if (frag.indexOf(this.options.root) != 0) frag = this.options.root + frag;
+        this.fragment = frag;
+        window.history[options.replace ? 'replaceState' : 'pushState']({}, document.title, frag);
+
+      // If hash changes haven't been explicitly disabled, update the hash
+      // fragment to store history.
+      } else if (this._wantsHashChange) {
+        this.fragment = frag;
+        this._updateHash(window.location, frag, options.replace);
+        if (this.iframe && (frag != this.getFragment(this.iframe.location.hash))) {
+          // Opening and closing the iframe tricks IE7 and earlier to push a history entry on hash-tag change.
+          // When replace is true, we don't want this.
+          if(!options.replace) this.iframe.document.open().close();
+          this._updateHash(this.iframe.location, frag, options.replace);
+        }
+
+      // If you've told us that you explicitly don't want fallback hashchange-
+      // based history, then `navigate` becomes a page refresh.
+      } else {
+        window.location.assign(this.options.root + fragment);
+      }
+      if (options.trigger) this.loadUrl(fragment);
+    },
+
+    // Update the hash location, either replacing the current entry, or adding
+    // a new one to the browser history.
+    _updateHash: function(location, fragment, replace) {
+      if (replace) {
+        location.replace(location.toString().replace(/(javascript:|#).*$/, '') + '#' + fragment);
+      } else {
+        location.hash = fragment;
+      }
+    }
+  });
+
+  // Backbone.View
+  // -------------
+
+  // Creating a Backbone.View creates its initial element outside of the DOM,
+  // if an existing element is not provided...
+  Backbone.View = function(options) {
+    this.cid = _.uniqueId('view');
+    this._configure(options || {});
+    this._ensureElement();
+    this.initialize.apply(this, arguments);
+    this.delegateEvents();
+  };
+
+  // Cached regex to split keys for `delegate`.
+  var eventSplitter = /^(\S+)\s*(.*)$/;
+
+  // List of view options to be merged as properties.
+  var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
+
+  // Set up all inheritable **Backbone.View** properties and methods.
+  _.extend(Backbone.View.prototype, Backbone.Events, {
+
+    // The default `tagName` of a View's element is `"div"`.
+    tagName: 'div',
+
+    // jQuery delegate for element lookup, scoped to DOM elements within the
+    // current view. This should be prefered to global lookups where possible.
+    $: function(selector) {
+      return $(selector, this.el);
+    },
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // **render** is the core function that your view should override, in order
+    // to populate its element (`this.el`), with the appropriate HTML. The
+    // convention is for **render** to always return `this`.
+    render: function() {
+      return this;
+    },
+
+    // Remove this view from the DOM. Note that the view isn't present in the
+    // DOM by default, so calling this method may be a no-op.
+    remove: function() {
+      this.$el.remove();
+      return this;
+    },
+
+    // For small amounts of DOM Elements, where a full-blown template isn't
+    // needed, use **make** to manufacture elements, one at a time.
+    //
+    //     var el = this.make('li', {'class': 'row'}, this.model.escape('title'));
+    //
+    make: function(tagName, attributes, content) {
+      var el = document.createElement(tagName);
+      if (attributes) $(el).attr(attributes);
+      if (content) $(el).html(content);
+      return el;
+    },
+
+    // Change the view's element (`this.el` property), including event
+    // re-delegation.
+    setElement: function(element, delegate) {
+      this.$el = $(element);
+      this.el = this.$el[0];
+      if (delegate !== false) this.delegateEvents();
+    },
+
+    // Set callbacks, where `this.events` is a hash of
+    //
+    // *{"event selector": "callback"}*
+    //
+    //     {
+    //       'mousedown .title':  'edit',
+    //       'click .button':     'save'
+    //       'click .open':       function(e) { ... }
+    //     }
+    //
+    // pairs. Callbacks will be bound to the view, with `this` set properly.
+    // Uses event delegation for efficiency.
+    // Omitting the selector binds the event to `this.el`.
+    // This only works for delegate-able events: not `focus`, `blur`, and
+    // not `change`, `submit`, and `reset` in Internet Explorer.
+    delegateEvents: function(events) {
+      if (!(events || (events = getValue(this, 'events')))) return;
+      this.undelegateEvents();
+      for (var key in events) {
+        var method = events[key];
+        if (!_.isFunction(method)) method = this[events[key]];
+        if (!method) throw new Error('Event "' + events[key] + '" does not exist');
+        var match = key.match(eventSplitter);
+        var eventName = match[1], selector = match[2];
+        method = _.bind(method, this);
+        eventName += '.delegateEvents' + this.cid;
+        if (selector === '') {
+          this.$el.bind(eventName, method);
+        } else {
+          this.$el.delegate(selector, eventName, method);
+        }
+      }
+    },
+
+    // Clears all callbacks previously bound to the view with `delegateEvents`.
+    // You usually don't need to use this, but may wish to if you have multiple
+    // Backbone views attached to the same DOM element.
+    undelegateEvents: function() {
+      this.$el.unbind('.delegateEvents' + this.cid);
+    },
+
+    // Performs the initial configuration of a View with a set of options.
+    // Keys with special meaning *(model, collection, id, className)*, are
+    // attached directly to the view.
+    _configure: function(options) {
+      if (this.options) options = _.extend({}, this.options, options);
+      for (var i = 0, l = viewOptions.length; i < l; i++) {
+        var attr = viewOptions[i];
+        if (options[attr]) this[attr] = options[attr];
+      }
+      this.options = options;
+    },
+
+    // Ensure that the View has a DOM element to render into.
+    // If `this.el` is a string, pass it through `$()`, take the first
+    // matching element, and re-assign it to `el`. Otherwise, create
+    // an element from the `id`, `className` and `tagName` properties.
+    _ensureElement: function() {
+      if (!this.el) {
+        var attrs = getValue(this, 'attributes') || {};
+        if (this.id) attrs.id = this.id;
+        if (this.className) attrs['class'] = this.className;
+        this.setElement(this.make(this.tagName, attrs), false);
+      } else {
+        this.setElement(this.el, false);
+      }
+    }
+
+  });
+
+  // The self-propagating extend function that Backbone classes use.
+  var extend = function (protoProps, classProps) {
+    var child = inherits(this, protoProps, classProps);
+    child.extend = this.extend;
+    return child;
+  };
+
+  // Set up inheritance for the model, collection, and view.
+  Backbone.Model.extend = Backbone.Collection.extend =
+    Backbone.Router.extend = Backbone.View.extend = extend;
+
+  // Backbone.sync
+  // -------------
+
+  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
+  var methodMap = {
+    'create': 'POST',
+    'update': 'PUT',
+    'delete': 'DELETE',
+    'read':   'GET'
+  };
+
+  // Override this function to change the manner in which Backbone persists
+  // models to the server. You will be passed the type of request, and the
+  // model in question. By default, makes a RESTful Ajax request
+  // to the model's `url()`. Some possible customizations could be:
+  //
+  // * Use `setTimeout` to batch rapid-fire updates into a single request.
+  // * Send up the models as XML instead of JSON.
+  // * Persist models via WebSockets instead of Ajax.
+  //
+  // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
+  // as `POST`, with a `_method` parameter containing the true HTTP method,
+  // as well as all requests with the body as `application/x-www-form-urlencoded`
+  // instead of `application/json` with the model in a param named `model`.
+  // Useful when interfacing with server-side languages like **PHP** that make
+  // it difficult to read the body of `PUT` requests.
+  Backbone.sync = function(method, model, options) {
+    var type = methodMap[method];
+
+    // Default JSON-request options.
+    var params = {type: type, dataType: 'json'};
+
+    // Ensure that we have a URL.
+    if (!options.url) {
+      params.url = getValue(model, 'url') || urlError();
+    }
+
+    // Ensure that we have the appropriate request data.
+    if (!options.data && model && (method == 'create' || method == 'update')) {
+      params.contentType = 'application/json';
+      params.data = JSON.stringify(model.toJSON());
+    }
+
+    // For older servers, emulate JSON by encoding the request into an HTML-form.
+    if (Backbone.emulateJSON) {
+      params.contentType = 'application/x-www-form-urlencoded';
+      params.data = params.data ? {model: params.data} : {};
+    }
+
+    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
+    // And an `X-HTTP-Method-Override` header.
+    if (Backbone.emulateHTTP) {
+      if (type === 'PUT' || type === 'DELETE') {
+        if (Backbone.emulateJSON) params.data._method = type;
+        params.type = 'POST';
+        params.beforeSend = function(xhr) {
+          xhr.setRequestHeader('X-HTTP-Method-Override', type);
+        };
+      }
+    }
+
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET' && !Backbone.emulateJSON) {
+      params.processData = false;
+    }
+
+    // Make the request, allowing the user to override any Ajax options.
+    return $.ajax(_.extend(params, options));
+  };
+
+  // Wrap an optional error callback with a fallback error event.
+  Backbone.wrapError = function(onError, originalModel, options) {
+    return function(model, resp) {
+      var resp = model === originalModel ? resp : model;
+      if (onError) {
+        onError(model, resp, options);
+      } else {
+        originalModel.trigger('error', model, resp, options);
+      }
+    };
+  };
+
+  // Helpers
+  // -------
+
+  // Shared empty constructor function to aid in prototype-chain creation.
+  var ctor = function(){};
+
+  // Helper function to correctly set up the prototype chain, for subclasses.
+  // Similar to `goog.inherits`, but uses a hash of prototype properties and
+  // class properties to be extended.
+  var inherits = function(parent, protoProps, staticProps) {
+    var child;
+
+    // The constructor function for the new subclass is either defined by you
+    // (the "constructor" property in your `extend` definition), or defaulted
+    // by us to simply call the parent's constructor.
+    if (protoProps && protoProps.hasOwnProperty('constructor')) {
+      child = protoProps.constructor;
+    } else {
+      child = function(){ parent.apply(this, arguments); };
+    }
+
+    // Inherit class (static) properties from parent.
+    _.extend(child, parent);
+
+    // Set the prototype chain to inherit from `parent`, without calling
+    // `parent`'s constructor function.
+    ctor.prototype = parent.prototype;
+    child.prototype = new ctor();
+
+    // Add prototype properties (instance properties) to the subclass,
+    // if supplied.
+    if (protoProps) _.extend(child.prototype, protoProps);
+
+    // Add static properties to the constructor function, if supplied.
+    if (staticProps) _.extend(child, staticProps);
+
+    // Correctly set child's `prototype.constructor`.
+    child.prototype.constructor = child;
+
+    // Set a convenience property in case the parent's prototype is needed later.
+    child.__super__ = parent.prototype;
+
+    return child;
+  };
+
+  // Helper function to get a value from a Backbone object as a property
+  // or as a function.
+  var getValue = function(object, prop) {
+    if (!(object && object[prop])) return null;
+    return _.isFunction(object[prop]) ? object[prop]() : object[prop];
+  };
+
+  // Throw an error when a URL is needed, and none is supplied.
+  var urlError = function() {
+    throw new Error('A "url" property or function must be specified');
+  };
+
+}).call(this);
diff --git a/client/js/front.events.js b/client/js/front.events.js
index 6790e8f..e0d6a59 100755
--- a/client/js/front.events.js
+++ b/client/js/front.events.js
@@ -62,16 +62,13 @@ kiwi.front.events = {
         if (!plugin_event) {
             return;
         }
-        tab = Tabview.getTab(plugin_event.destination);
-        if (!tab) {
-            tab = new Tabview(plugin_event.destination);
-        }
-        tab.addMsg(null, plugin_event.nick, plugin_event.msg);
         
         var chan = kiwi.bbchans.detect(function (c) {
             return c.get("name") === plugin_event.destination;
         });
-        chan.addMsg(null, plugin_event.nick, plugin_event.msg);
+        if (chan) {
+            chan.addMsg(null, plugin_event.nick, plugin_event.msg);
+        }
     },
 
     /**
@@ -101,11 +98,12 @@ kiwi.front.events = {
             destination = data.channel;
         }
 
-        tab = Tabview.getTab(destination);
-        if (!tab) {
-            tab = new Tabview(destination);
+        var chan = kiwi.bbchans.detect(function (c) {
+            return c.get("name") === plugin_event.destination;
+        });
+        if (chan) {
+            chan.addMsg(null, ' ', '* ' + data.nick + ' ' + data.msg, 'action', 'color:#555;');
         }
-        tab.addMsg(null, ' ', '* ' + data.nick + ' ' + data.msg, 'action', 'color:#555;');
     },
 
     /**
@@ -114,9 +112,11 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onTopic: function (e, data) {
-        var tab = Tabview.getTab(data.channel);
-        if (tab) {
-            tab.changeTopic(data.topic);
+        var chan = kiwi.bbchans.detect(function (c) {
+            return c.get("name") === data.channel;
+        });
+        if (chan) {
+            chan.set({"topic": data.topic});
         }
     },
 
@@ -126,11 +126,12 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onTopicSetBy: function (e, data) {
-        var when, tab = Tabview.getTab(data.channel);
-        if (tab) {
-            when = new Date(data.when * 1000).toLocaleString();
-            tab.addMsg(null, '', 'Topic set by ' + data.nick + ' at ' + when, 'topic');
-        }
+        var when,
+            chan = kiwi.bbchans.detect(function (c) {
+                return c.get("name") === data.channel;
+            });
+        when = new Date(data.when * 1000).toLocaleString();
+        chan.addMsg(null, '', 'Topic set by ' + data.nick + ' at ' + when, 'topic');
     },
 
     /**
@@ -140,14 +141,14 @@ kiwi.front.events = {
     */
     onNotice: function (e, data) {
         var nick = (data.nick === undefined) ? '' : data.nick,
-            enick = '[' + nick + ']';
+            enick = '[' + nick + ']',
+            chan;
 
-        if (Tabview.tabExists(data.target)) {
-            Tabview.getTab(data.target).addMsg(null, enick, data.msg, 'notice');
-        } else if (Tabview.tabExists(nick)) {
-            Tabview.getTab(nick).addMsg(null, enick, data.msg, 'notice');
-        } else {
-            Tabview.getServerTab().addMsg(null, enick, data.msg, 'notice');
+        chan = kiwi.bbchans.detect(function (c) {
+            return c.get("name") === data.channel;
+        });
+        if (chan) {
+            chan.addMsg(null, enick, data.msg, 'notice');
         }
     },
 
@@ -206,15 +207,15 @@ kiwi.front.events = {
                 err_box.parent().removeClass('disconnect');
 
                 // Rejoin channels
-                channels = '';
-                _.each(Tabview.getAllTabs(), function (tabview) {
-                    if (tabview.name === 'server') {
-                        return;
-                    }
-                    channels += tabview.name + ',';
-                });
-                console.log('Rejoining: ' + channels);
-                kiwi.gateway.join(channels);
+                //channels = '';
+                //_.each(Tabview.getAllTabs(), function (tabview) {
+                //    if (tabview.name === 'server') {
+                //        return;
+                //    }
+                //    channels += tabview.name + ',';
+                //});
+                //console.log('Rejoining: ' + channels);
+                //kiwi.gateway.join(channels);
                 return;
             }
 
@@ -223,13 +224,13 @@ kiwi.front.events = {
                 kiwi.front.ui.doLayout();
             }
 
-            Tabview.getServerTab().addMsg(null, ' ', '=== Connected OK :)', 'status');
-            if (typeof init_data.channel === "string") {
-                kiwi.front.joinChannel(init_data.channel);
-            }
+            //Tabview.getServerTab().addMsg(null, ' ', '=== Connected OK :)', 'status');
+            //if (typeof init_data.channel === "string") {
+            //    kiwi.front.joinChannel(init_data.channel);
+            //}
             kiwi.plugs.run('connect', {success: true});
         } else {
-            Tabview.getServerTab().addMsg(null, ' ', '=== Failed to connect :(', 'status');
+            //Tabview.getServerTab().addMsg(null, ' ', '=== Failed to connect :(', 'status');
             kiwi.plugs.run('connect', {success: false});
         }
 
@@ -243,7 +244,7 @@ kiwi.front.events = {
     */
     onConnectFail: function (e, data) {
         var reason = (typeof data.reason === 'string') ? data.reason : '';
-        Tabview.getServerTab().addMsg(null, '', 'There\'s a problem connecting! (' + reason + ')', 'error');
+        //Tabview.getServerTab().addMsg(null, '', 'There\'s a problem connecting! (' + reason + ')', 'error');
         kiwi.plugs.run('connect', {success: false});
     },
     /**
@@ -253,10 +254,10 @@ kiwi.front.events = {
     */
     onDisconnect: function (e, data) {
         var tab, tabs;
-        tabs = Tabview.getAllTabs();
-        for (tab in tabs) {
-            tabs[tab].addMsg(null, '', 'Disconnected from server!', 'error disconnect');
-        }
+        //tabs = Tabview.getAllTabs();
+        //for (tab in tabs) {
+        //    tabs[tab].addMsg(null, '', 'Disconnected from server!', 'error disconnect');
+        //}
         kiwi.plugs.run('disconnect', {success: false});
     },
     /**
@@ -306,7 +307,7 @@ kiwi.front.events = {
     */
     onOptions: function (e, data) {
         if (typeof kiwi.gateway.network_name === "string" && kiwi.gateway.network_name !== "") {
-            Tabview.getServerTab().setTabText(kiwi.gateway.network_name);
+            //Tabview.getServerTab().setTabText(kiwi.gateway.network_name);
         }
     },
     /**
@@ -315,7 +316,7 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onMOTD: function (e, data) {
-        Tabview.getServerTab().addMsg(null, data.server, data.msg, 'motd');
+        //Tabview.getServerTab().addMsg(null, data.server, data.msg, 'motd');
     },
     /**
     *   Handles the whois event
@@ -335,18 +336,18 @@ kiwi.front.events = {
             idle_time = idle_time.h.toString().lpad(2, "0") + ':' + idle_time.m.toString().lpad(2, "0") + ':' + idle_time.s.toString().lpad(2, "0");
         }
 
-        tab = Tabview.getCurrentTab();
-        if (data.msg) {
-            tab.addMsg(null, data.nick, data.msg, 'whois');
-        } else if (data.logon) {
-            d = new Date();
-            d.setTime(data.logon * 1000);
-            d = d.toLocaleString();
+        //tab = Tabview.getCurrentTab();
+        //if (data.msg) {
+        //    tab.addMsg(null, data.nick, data.msg, 'whois');
+        //} else if (data.logon) {
+        //    d = new Date();
+        //    d.setTime(data.logon * 1000);
+        //    d = d.toLocaleString();
 
-            tab.addMsg(null, data.nick, 'idle for ' + idle_time + ', signed on ' + d, 'whois');
-        } else {
-            tab.addMsg(null, data.nick, 'idle for ' + idle_time, 'whois');
-        }
+        //    tab.addMsg(null, data.nick, 'idle for ' + idle_time + ', signed on ' + d, 'whois');
+        //} else {
+        //    tab.addMsg(null, data.nick, 'idle for ' + idle_time, 'whois');
+        //}
     },
     /**
     *   Handles the mode event
@@ -354,15 +355,30 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onMode: function (e, data) {
-        var tab;
+        var tab, mem;
         if ((typeof data.channel === 'string') && (typeof data.effected_nick === 'string')) {
-            tab = Tabview.getTab(data.channel);
-            tab.addMsg(null, ' ', '[' + data.mode + '] ' + data.effected_nick + ' by ' + data.nick, 'mode', '');
-            if (tab.userlist.hasUser(data.effected_nick)) {
-                tab.userlist.changeUserMode(data.effected_nick, data.mode.substr(1), (data.mode[0] === '+'));
+        //    tab = Tabview.getTab(data.channel);
+        //    tab.addMsg(null, ' ', '[' + data.mode + '] ' + data.effected_nick + ' by ' + data.nick, 'mode', '');
+        //    if (tab.userlist.hasUser(data.effected_nick)) {
+        //        tab.userlist.changeUserMode(data.effected_nick, data.mode.substr(1), (data.mode[0] === '+'));
+        //    }
+            chan = kiwi.bbchans.detect(function (c) {
+                return c.get("name") === data.channel;
+            });
+            if (chan) {
+                chan.addMsg(null, ' ', '[' + data.mode + '] ' + data.effected_nick + ' by ' + data.nick, 'mode', '');
+                mem = _.detect(chan.get("members"), function (m) {
+                    return data.effected_nick === m.get("nick");
+                });
+                if (mem) {
+                    if (data.mode[0] === '+') {
+                        mem.addMode(data.mode);
+                    } else {
+                        mem.removeMode(data.mode);
+                    }
+                }
             }
         }
-
         // TODO: Other mode changes that aren't +/- qaohv. - JA
     },
     /**
@@ -371,24 +387,29 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onUserList: function (e, data) {
-        var tab;
+        var tab, chan;
 
-        tab = Tabview.getTab(data.channel);
-        if (!tab) {
-            return;
-        }
+        //tab = Tabview.getTab(data.channel);
+        //if (!tab) {
+        //    return;
+        //}
 
+        chan = kiwi.bbchans.detect(function (c) {
+            return c.get("name") === data.channel;
+        });
         if ((!kiwi.front.cache.userlist) || (!kiwi.front.cache.userlist.updating)) {
             if (!kiwi.front.cache.userlist) {
                 kiwi.front.cache.userlist = {updating: true};
             } else {
                 kiwi.front.cache.userlist.updating = true;
             }
-            tab.userlist.empty();
+            chan.get("members").reset();
         }
 
-        tab.userlist.addUser(data.users);
-
+        //tab.userlist.addUser(data.users);
+        if (chan) {
+            chan.get("members").add(data.users, {"silent": true});
+        }
     },
     /**
     *   Handles the userListEnd event
@@ -400,6 +421,12 @@ kiwi.front.events = {
             kiwi.front.cache.userlist = {};
         }
         kiwi.front.cache.userlist.updating = false;
+        chan = kiwi.bbchans.detect(function (c) {
+            return c.get("name") === data.channel;
+        });
+        if (chan) {
+            chan.get("members").trigger("change");
+        }
     },
 
     /**
@@ -452,21 +479,30 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onJoin: function (e, data) {
-        var tab = Tabview.getTab(data.channel);
-        if (!tab) {
-            tab = new Tabview(data.channel.toLowerCase());
-        }
+        //var tab = Tabview.getTab(data.channel);
+        //if (!tab) {
+        //    tab = new Tabview(data.channel.toLowerCase());
+        //}
 
-        tab.addMsg(null, ' ', '--> ' + data.nick + ' [' + data.ident + '@' + data.hostname + '] has joined', 'action join', 'color:#009900;');
+        //tab.addMsg(null, ' ', '--> ' + data.nick + ' [' + data.ident + '@' + data.hostname + '] has joined', 'action join', 'color:#009900;');
 
-        var c = new kiwi.model.Channel({"name": data.channel.toLowerCase()});
-        c.get("members").add(new kiwi.model.Member({"nick": data.nick, "modes": []}));
-        kiwi.bbchans.add(c);
-        if (data.nick === kiwi.gateway.nick) {
-            return; // Not needed as it's already in nicklist
+        chan = kiwi.bbchans.detect(function (c) {
+            return c.get("name") === data.channel;
+        });
+        if (!chan) {
+            chan = new kiwi.model.Channel({"name": data.channel.toLowerCase()});
+            chan.get("members").add(new kiwi.model.Member({"nick": data.nick, "modes": []}));
+            kiwi.bbchans.add(chan);
+        } else {
+            chan.get("members").add(data.users, {"silent": true});
         }
+        chan.view.show();
+
+        //if (data.nick === kiwi.gateway.nick) {
+        //    return; // Not needed as it's already in nicklist
+        //}
 
-        tab.userlist.addUser({nick: data.nick, modes: []});
+        //tab.userlist.addUser({nick: data.nick, modes: []});
     },
     /**
     *   Handles the part event
@@ -474,17 +510,32 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onPart: function (e, data) {
-        var tab = Tabview.getTab(data.channel);
-        if (tab) {
+        var chan, members;
+        //var tab = Tabview.getTab(data.channel);
+        //if (tab) {
             // If this is us, close the tabview
+        //    if (data.nick === kiwi.gateway.nick) {
+        //        tab.close();
+        //        Tabview.getServerTab().show();
+        //        return;
+        //    }
+
+        //    tab.addMsg(null, ' ', '<-- ' + data.nick + ' has left (' + data.message + ')', 'action part', 'color:#990000;');
+        //    tab.userlist.removeUser(data.nick);
+        //}
+        chan = kiwi.bbchans.detect(function (c) {
+            return c.get("name") === data.channel;
+        });
+        if (chan) {
             if (data.nick === kiwi.gateway.nick) {
-                tab.close();
-                Tabview.getServerTab().show();
-                return;
+                chan.trigger("close");
+            } else {
+                chan.addMsg(null, ' ', '<-- ' + data.nick + ' has left (' + data.message + ')', 'action part', 'color:#990000;');
+                members = chan.get("members");
+                members.remove(_.detect(members, function (m) {
+                    return data.nick === m.get("nick");
+                }));
             }
-
-            tab.addMsg(null, ' ', '<-- ' + data.nick + ' has left (' + data.message + ')', 'action part', 'color:#990000;');
-            tab.userlist.removeUser(data.nick);
         }
     },
     /**
@@ -493,20 +544,20 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onKick: function (e, data) {
-        var tab = Tabview.getTab(data.channel);
-        if (tab) {
-            // If this is us, close the tabview
-            if (data.kicked === kiwi.gateway.nick) {
-                //tab.close();
-                tab.addMsg(null, ' ', '=== You have been kicked from ' + data.channel + '. ' + data.message, 'status kick');
-                tab.safe_to_close = true;
-                tab.userlist.remove();
-                return;
-            }
-
-            tab.addMsg(null, ' ', '<-- ' + data.kicked + ' kicked by ' + data.nick + '(' + data.message + ')', 'action kick', 'color:#990000;');
-            tab.userlist.removeUser(data.nick);
-        }
+        //var tab = Tabview.getTab(data.channel);
+        //if (tab) {
+        //    // If this is us, close the tabview
+        //    if (data.kicked === kiwi.gateway.nick) {
+        //        //tab.close();
+        //        tab.addMsg(null, ' ', '=== You have been kicked from ' + data.channel + '. ' + data.message, 'status kick');
+        //        tab.safe_to_close = true;
+        //        tab.userlist.remove();
+        //        return;
+        //    }
+
+        //    tab.addMsg(null, ' ', '<-- ' + data.kicked + ' kicked by ' + data.nick + '(' + data.message + ')', 'action kick', 'color:#990000;');
+        //    tab.userlist.removeUser(data.nick);
+        //}
     },
     /**
     *   Handles the nick event
@@ -514,17 +565,17 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onNick: function (e, data) {
-        if (data.nick === kiwi.gateway.nick) {
-            kiwi.gateway.nick = data.newnick;
-            kiwi.front.ui.doLayout();
-        }
+        //if (data.nick === kiwi.gateway.nick) {
+        //    kiwi.gateway.nick = data.newnick;
+        //    kiwi.front.ui.doLayout();
+        //}
 
-        _.each(Tabview.getAllTabs(), function (tab) {
-            if (tab.userlist.hasUser(data.nick)) {
-                tab.userlist.renameUser(data.nick, data.newnick);
-                tab.addMsg(null, ' ', '=== ' + data.nick + ' is now known as ' + data.newnick, 'action changenick');
-            }
-        });
+        //_.each(Tabview.getAllTabs(), function (tab) {
+        //    if (tab.userlist.hasUser(data.nick)) {
+        //        tab.userlist.renameUser(data.nick, data.newnick);
+        //        tab.addMsg(null, ' ', '=== ' + data.nick + ' is now known as ' + data.newnick, 'action changenick');
+        //    }
+        //});
     },
     /**
     *   Handles the quit event
@@ -532,12 +583,12 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onQuit: function (e, data) {
-        _.each(Tabview.getAllTabs(), function (tab) {
-            if (tab.userlist.hasUser(data.nick)) {
-                tab.userlist.removeUser(data.nick);
-                tab.addMsg(null, ' ', '<-- ' + data.nick + ' has quit (' + data.message + ')', 'action quit', 'color:#990000;');
-            }
-        });
+        //_.each(Tabview.getAllTabs(), function (tab) {
+        //    if (tab.userlist.hasUser(data.nick)) {
+        //        tab.userlist.removeUser(data.nick);
+        //        tab.addMsg(null, ' ', '<-- ' + data.nick + ' has quit (' + data.message + ')', 'action quit', 'color:#990000;');
+        //    }
+        //});
     },
     /**
     *   Handles the channelRedirect event
@@ -545,10 +596,10 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onChannelRedirect: function (e, data) {
-        var tab = Tabview.getTab(data.from);
-        tab.close();
-        tab = new Tabview(data.to);
-        tab.addMsg(null, ' ', '=== Redirected from ' + data.from, 'action');
+        //var tab = Tabview.getTab(data.from);
+        //tab.close();
+        //tab = new Tabview(data.to);
+        //tab.addMsg(null, ' ', '=== Redirected from ' + data.from, 'action');
     },
 
     /**
@@ -557,7 +608,7 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data
     */
     onIRCError: function (e, data) {
-        var t_view,
+        /*var t_view,
             tab = Tabview.getTab(data.channel);
         if (data.channel !== undefined && tab) {
             t_view = data.channel;
@@ -604,7 +655,7 @@ kiwi.front.events = {
         default:
             // We don't know what data contains, so don't do anything with it.
             console.log(e, data);
-        }
+        }*/
     },
 
 
diff --git a/client/js/front.js b/client/js/front.js
index 99c5164..4dba63b 100755
--- a/client/js/front.js
+++ b/client/js/front.js
@@ -172,15 +172,15 @@ kiwi.front = {
         kiwi.bbtabs = new kiwi.view.Tabs({"el": $('#kiwi .windowlist ul')[0], "model": kiwi.bbchans});
         
         
-        server_tabview = new Tabview('server');
-        server_tabview.userlist.setWidth(0); // Disable the userlist
-        server_tabview.setIcon('/img/app_menu.png');
-        $('.icon', server_tabview.tab).tipTip({
-            delay: 0,
-            keepAlive: true,
-            content: $('#tmpl_network_menu').tmpl({}).html(),
-            activation: 'click'
-        });
+        //server_tabview = new Tabview('server');
+        //server_tabview.userlist.setWidth(0); // Disable the userlist
+        //server_tabview.setIcon('/img/app_menu.png');
+        //$('.icon', server_tabview.tab).tipTip({
+        //    delay: 0,
+        //    keepAlive: true,
+        //    content: $('#tmpl_network_menu').tmpl({}).html(),
+        //    activation: 'click'
+        //});
 
         // Any pre-defined nick?
         if (typeof window.init_data.nick === "string") {
@@ -224,8 +224,8 @@ kiwi.front = {
             var chan, text;
             text = $(this).text();
             if (text !== kiwi.front.cache.original_topic) {
-                chan = Tabview.getCurrentTab().name;
-                kiwi.gateway.topic(chan, text);
+                //chan = Tabview.getCurrentTab().name;
+                //kiwi.gateway.topic(chan, text);
             }
         });
 
@@ -259,13 +259,13 @@ kiwi.front = {
             tab;
         for (i in chans) {
             chan = chans[i];
-            tab = Tabview.getTab(chan);
-            if ((!tab) || (tab.safe_to_close === true)) {
+            //tab = Tabview.getTab(chan);
+            //if ((!tab) || (tab.safe_to_close === true)) {
                 kiwi.gateway.join(chan);
-                tab = new Tabview(chan);
-            } else {
-                tab.show();
-            }
+                //tab = new Tabview(chan);
+            //} else {
+            //    tab.show();
+            //}
         }
     },
 
@@ -313,7 +313,8 @@ kiwi.front = {
                     parts[3] = true;
                 }
 
-                Tabview.getCurrentTab().addMsg(null, ' ', '=== Connecting to ' + parts[1] + ' on port ' + parts[2] + (parts[3] ? ' using SSL' : '') + '...', 'status');
+                //Tabview.getCurrentTab().addMsg(null, ' ', '=== Connecting to ' + parts[1] + ' on port ' + parts[2] + (parts[3] ? ' using SSL' : '') + '...', 'status');
+                console.log('Connecting to ' + parts[1] + ' on port ' + parts[2] + (parts[3] ? ' using SSL' : '') + '...');
                 kiwi.gateway.connect(parts[1], parts[2], parts[3], parts[4]);
                 break;
 
@@ -330,11 +331,11 @@ kiwi.front = {
 
             case '/part':
                 if (typeof parts[1] === "undefined") {
-                    if (Tabview.getCurrentTab().safe_to_close) {
-                        Tabview.getCurrentTab().close();
-                    } else {
-                        kiwi.gateway.part(Tabview.getCurrentTab().name);
-                    }
+                    //if (Tabview.getCurrentTab().safe_to_close) {
+                    //    Tabview.getCurrentTab().close();
+                    //} else {
+                    //    kiwi.gateway.part(Tabview.getCurrentTab().name);
+                    //}
                 } else {
                     kiwi.gateway.part(msg.substring(6));
                 }
@@ -353,7 +354,7 @@ kiwi.front = {
             case '/q':
             case '/query':
                 if (typeof parts[1] !== "undefined") {
-                    tab = new Tabview(parts[1]);
+                    //tab = new Tabview(parts[1]);
                 }
                 break;
 
@@ -364,11 +365,11 @@ kiwi.front = {
                     msg_sliced = msg.split(' ').slice(2).join(' ');
                     kiwi.gateway.privmsg(parts[1], msg_sliced);
 
-                    tab = Tabview.getTab(parts[1]);
-                    if (!tab) {
-                        tab = new Tabview(parts[1]);
-                    }
-                    tab.addMsg(null, kiwi.gateway.nick, msg_sliced);
+                    //tab = Tabview.getTab(parts[1]);
+                    //if (!tab) {
+                    //    tab = new Tabview(parts[1]);
+                    //}
+                    //tab.addMsg(null, kiwi.gateway.nick, msg_sliced);
                 }
                 break;
 
@@ -379,7 +380,7 @@ kiwi.front = {
                 }
                 t = msg.split(' ', 3);
                 nick = t[1];
-                kiwi.gateway.kick(Tabview.getCurrentTab().name, nick, t[2]);
+                //kiwi.gateway.kick(Tabview.getCurrentTab().name, nick, t[2]);
                 break;
 
             case '/quote':
@@ -387,9 +388,9 @@ kiwi.front = {
                 break;
 
             case '/me':
-                tab = Tabview.getCurrentTab();
-                kiwi.gateway.ctcp(true, 'ACTION', tab.name, msg.substring(4));
-                tab.addMsg(null, ' ', '* ' + kiwi.gateway.nick + ' ' + msg.substring(4), 'action', 'color:#555;');
+                //tab = Tabview.getCurrentTab();
+                //kiwi.gateway.ctcp(true, 'ACTION', tab.name, msg.substring(4));
+                //tab.addMsg(null, ' ', '* ' + kiwi.gateway.nick + ' ' + msg.substring(4), 'action', 'color:#555;');
                 break;
 
             case '/notice':
@@ -424,12 +425,12 @@ kiwi.front = {
                         t.setSelectionRange(pos, pos);
                     }
                 } else {
-                    kiwi.gateway.topic(Tabview.getCurrentTab().name, msg.split(' ', 2)[1]);
+                    //kiwi.gateway.topic(Tabview.getCurrentTab().name, msg.split(' ', 2)[1]);
                 }
                 break;
 
             case '/kiwi':
-                kiwi.gateway.ctcp(true, 'KIWI', Tabview.getCurrentTab().name, msg.substring(6));
+                //kiwi.gateway.ctcp(true, 'KIWI', Tabview.getCurrentTab().name, msg.substring(6));
                 break;
 
             case '/ctcp':
@@ -440,7 +441,7 @@ kiwi.front = {
                 console.log(parts);
                 
                 kiwi.gateway.ctcp(true, t, dest, msg);
-                Tabview.getServerTab().addMsg(null, 'CTCP Request', '[to ' + dest + '] ' + t + ' ' + msg, 'ctcp');
+                //Tabview.getServerTab().addMsg(null, 'CTCP Request', '[to ' + dest + '] ' + t + ' ' + msg, 'ctcp');
                 break;
             default:
                 //Tabview.getCurrentTab().addMsg(null, ' ', '--> Invalid command: '+parts[0].substring(1));
@@ -453,10 +454,10 @@ kiwi.front = {
             if (msg.trim() === '') {
                 return;
             }
-            if (Tabview.getCurrentTab().name !== 'server') {
-                kiwi.gateway.privmsg(Tabview.getCurrentTab().name, msg);
-                Tabview.getCurrentTab().addMsg(null, kiwi.gateway.nick, msg);
-            }
+            //if (Tabview.getCurrentTab().name !== 'server') {
+            //    kiwi.gateway.privmsg(Tabview.getCurrentTab().name, msg);
+            //    Tabview.getCurrentTab().addMsg(null, kiwi.gateway.nick, msg);
+            //}
         }
     },
 
@@ -471,7 +472,7 @@ kiwi.front = {
         var win_list = $('#kiwi .windowlist ul'),
             listitems = win_list.children('li').get();
         
-        listitems.sort(function (a, b) {
+        /*listitems.sort(function (a, b) {
             if (a === Tabview.getServerTab().tab[0]) {
                 return -1;
             }
@@ -485,7 +486,7 @@ kiwi.front = {
 
         $.each(listitems, function(idx, itm) {
             win_list.append(itm);
-        });
+        });*/
     },
 
 
@@ -752,459 +753,6 @@ var ChannelList = function () {
     };
 };
 
-/**
-*   @constructor
-*   @param  {String}    name    The name of the UserList
-*/
-var UserList = function (name) {
-    /*globals User */
-    var userlist, list_html, sortUsers;
-
-    userlist = [];
-
-    $('#kiwi .userlist').append($('<ul id="kiwi_userlist_' + name + '"></ul>'));
-    list_html = $('#kiwi_userlist_' + name);
-    $('a.nick', list_html[0]).live('click', this.clickHandler);
-
-    /**
-    *   @inner
-    */
-    sortUsers = function () {
-        var parent;
-        parent = list_html.parent();
-        list_html = list_html.detach();
-
-        // Not sure this is needed. 
-        // It's O(n^2) as well, so need to test to see if it works without.
-        // Alternative to test: list_html.children('li').detach();
-        list_html.children().each(function (child) {
-            var i, nick;
-            child = $(child);
-            nick = child.data('nick');
-            for (i = 0; i < userlist.length; i++) {
-                if (userlist[i].nick === nick) {
-                    userlist[i].html = child.detach();
-                    break;
-                }
-            }
-        });
-
-        userlist.sort(User.compare);
-
-        _.each(userlist, function (user) {
-            user.html = user.html.appendTo(list_html);
-        });
-
-        list_html = list_html.appendTo(parent);
-    };
-
-    /**
-    *   Adds a user or users to the UserList.
-    *   Chainable method.
-    *   @param      {Object}    users   The user or Array of users to add
-    *   @returns    {UserList}          This UserList
-    */
-    this.addUser = function (users) {
-        if (!_.isArray(users)) {
-            users = [users];
-        }
-        _.each(users, function (user) {
-            user = new User(user.nick, user.modes);
-            user.html = $('<li><a class="nick">' + user.prefix + user.nick + '</a></li>');
-            user.html.data('user', user);
-            userlist.push(user);
-        });
-        sortUsers();
-
-        return this;
-    };
-
-    /**
-    *   Removes a user or users from the UserList.
-    *   Chainable method.
-    *   @param      {String}    nicks   The nick or Array of nicks to remove
-    *   @returns    {UserList}          This UserList
-    */
-    this.removeUser = function (nicks) {
-        var toRemove;
-        if (!_.isArray(nicks)) {
-            nicks = [nicks];
-        }
-        toRemove = _.select(userlist, function (user) {
-            return _.any(nicks, function (n) {
-                return n === user.nick;
-            });
-        });
-
-        _.each(toRemove, function (user) {
-            user.html.remove();
-        });
-
-        userlist = _.difference(userlist, toRemove);
-
-        return this;
-    };
-
-    /**
-    *   Renames a user in the UserList.
-    *   Chainable method.
-    *   @param      {String}    oldNick The old nick
-    *   @param      {String}    newNick The new nick
-    *   @returns    {UserList}          This UserList
-    */
-    this.renameUser = function (oldNick, newNick) {
-        var user = _.detect(userlist, function (u) {
-            return u.nick === oldNick;
-        });
-        if (user) {
-            user.nick = newNick;
-            user.html.text(User.getPrefix(user.modes) + newNick);
-        }
-
-        sortUsers();
-
-        return this;
-    };
-
-    /**
-    *   Lists the users in this UserList.
-    *   @param      {Boolean}   modesort    True to enable sorting by mode, false for lexicographical sort
-    *   @param      {Array}     mode        If specified, only return those users who have the specified modes
-    *   @returns    {Array}                 The users in the UserList that match the criteria
-    */
-    this.listUsers = function (modesort, modes) {
-        var users = userlist;
-        if (modes) {
-            users = _.select(users, function (user) {
-                return _.any(modes, function (m) {
-                    return _.any(user.modes, function (um) {
-                        return m === um;
-                    });
-                });
-            });
-        }
-        if ((modesort === true) || (typeof modesort === undefined)) {
-            return users;
-        } else {
-            return _.sortBy(users, function (user) {
-                return user.nick;
-            });
-        }
-    };
-
-    /**
-    *   Remove this UserList from the DOM.
-    */
-    this.remove = function () {
-        list_html.remove();
-        list_html = null;
-        userlist = null;
-    };
-
-    /**
-    *   Empty the UserList.
-    *   Chainable method.
-    *   @returns    {UserList}  This UserList
-    */
-    this.empty = function () {
-        list_html.children().remove();
-        userlist = [];
-
-        return this;
-    };
-
-    /**
-    *   Checks whether a given nick is in the UserList.
-    *   @param      {String}    nick    The nick to search for
-    *   @returns    {Boolean}           True if the nick is in the userlist, false otherwise
-    */
-    this.hasUser = function (nick) {
-        return _.any(userlist, function (user) {
-            return user.nick === nick;
-        });
-    };
-
-    /**
-    *   Returns the object representing the user with the given nick, if it is in the UserList.
-    *   @param      {String}    nick    The nick to retrieve
-    *   @returns    {Object}            An object representing the user, if it exists, null otherwise
-    */
-    this.getUser = function (nick) {
-        if (this.hasUser(nick)) {
-            return _.detect(userlist, function (user) {
-                return user.nick === nick;
-            });
-        } else {
-            return null;
-        }
-    };
-
-    /**
-    *   Sets the UserList's activity.
-    *   Chainable method.
-    *   @param      {Boolean}   active  If true, sets the UserList to active. If False, sets it to inactive
-    *   @returns    {UserList}          This UserList
-    */
-    this.active = function (active) {
-        if ((arguments.length === 0) || (active)) {
-            list_html.addClass('active');
-            list_html.show();
-        } else {
-            list_html.removeClass('active');
-            list_html.hide();
-        }
-
-        return this;
-    };
-
-    /**
-    *   Updates a user's mode.
-    *   Chainable method.
-    *   @param      {String}    nick    The nick of the user to modify
-    *   @param      {String}    mode    The mode to add or remove
-    *   @param      {Boolean}   add     Adds the mode if true, removes it otherwise
-    *   @returns    {UserList}          This UserList
-    */
-    this.changeUserMode = function (nick, mode, add) {
-        var user, prefix;
-        if (this.hasUser(nick)) {
-            user = _.detect(userlist, function (u) {
-                return u.nick === nick;
-            });
-
-            prefix = user.prefix;
-            if ((arguments.length < 3) || (add)) {
-                user.addMode(mode);
-            } else {
-                user.removeMode(mode);
-            }
-            if (prefix !== user.prefix) {
-                user.html.children('a:first').text(user.prefix + user.nick);
-            }
-            sortUsers();
-        }
-
-        return this;
-    };
-};
-/**
-*   @memberOf UserList
-*/
-UserList.prototype.width = 100;     // 0 to disable
-/**
-*   Sets the width of the UserList.
-*   Chainable method.
-*   @param      {Number}    newWidth    The new width of the UserList
-*   @returns    {UserList}              This UserList
-*/
-UserList.prototype.setWidth = function (newWidth) {
-    var w, u;
-    if (typeof newWidth === 'number') {
-        this.width = newWidth;
-    }
-
-    w = $('#windows');
-    u = $('#kiwi .userlist');
-
-    u.width(this.width);
-
-    return this;
-};
-/**
-*   The click handler for this UserList
-*/
-UserList.prototype.clickHandler = function () {
-    var li = $(this).parent(),
-        user = li.data('user'),
-        userbox;
-    
-    // Remove any existing userboxes
-    $('#kiwi .userbox').remove();
-
-    if (li.data('userbox') === true) {
-        // This li already has the userbox, show remove it instead
-        li.removeData('userbox');
-
-    } else {
-        // We don't have a userbox so create one
-        userbox = $('#tmpl_user_box').tmpl({nick: user.nick}).appendTo(li);
-
-        $('.userbox_query', userbox).click(function (ev) {
-            var nick = $('#kiwi .userbox_nick').val();
-            kiwi.front.run('/query ' + nick);
-        });
-
-        $('.userbox_whois', userbox).click(function (ev) {
-            var nick = $('#kiwi .userbox_nick').val();
-            kiwi.front.run('/whois ' + nick);
-        });
-        li.data('userbox', true);
-    }
-};
-
-
-
-/**
-*   @constructor
-*   The User class. Represents a user on a channel.
-*   @param      {String}    nick    The user's nickname
-*   @param      {Array}     modes   An array of channel user modes
-*/
-var User = function (nick, modes) {
-    var sortModes;
-    /**
-    *   @inner
-    */
-    sortModes = function (modes) {
-        return modes.sort(function (a, b) {
-            var a_idx, b_idx, i;
-            for (i = 0; i < kiwi.gateway.user_prefixes.length; i++) {
-                if (kiwi.gateway.user_prefixes[i].mode === a) {
-                    a_idx = i;
-                }
-            }
-            for (i = 0; i < kiwi.gateway.user_prefixes.length; i++) {
-                if (kiwi.gateway.user_prefixes[i].mode === b) {
-                    b_idx = i;
-                }
-            }
-            if (a_idx < b_idx) {
-                return -1;
-            } else if (a_idx > b_idx) {
-                return 1;
-            } else {
-                return 0;
-            }
-        });
-    };
-
-    this.nick = User.stripPrefix(nick);
-    this.modes = modes || [];
-    this.modes = sortModes(this.modes);
-    this.prefix = User.getPrefix(this.modes);
-
-    /**
-    *   @inner
-    */
-    this.addMode = function (mode) {
-        this.modes.push(mode);
-        this.modes = sortModes(this.modes);
-        this.prefix = User.getPrefix(this.modes);
-        return this;
-    };
-};
-
-/**
-*   Removes a channel mode from the user
-*   @param      {String}    mode    The mode(s) to remove
-*   @returns    {User}              Returns the User object to allow chaining
-*/
-User.prototype.removeMode = function (mode) {
-    this.modes = _.reject(this.modes, function (m) {
-        return m === mode;
-    });
-    this.prefix = User.getPrefix(this.modes);
-    return this;
-};
-
-/**
-*   Checks to see if the user is an op on the channel
-*   @returns    {Boolean}   True if the user is an op, false otherwise
-*/
-User.prototype.isOp = function () {
-    // return true if this.mode[0] > o
-    return false;
-};
-
-/**
-*   Returns the highest user prefix (e.g.~, @, or +) that matches the modes given
-*   @param      {Array} modes   An array of mode letters
-*   @returns    {String}        The user's prefix
-*/
-User.getPrefix = function (modes) {
-    var prefix = '';
-    if (typeof modes[0] !== 'undefined') {
-        prefix = _.detect(kiwi.gateway.user_prefixes, function (prefix) {
-            return prefix.mode === modes[0];
-        });
-        prefix = (prefix) ? prefix.symbol : '';
-    }
-    return prefix;
-};
-
-/**
-*   Returns the user's nick without the mode prefix
-*   @param      {String}    nick    The nick to strip the prefix from
-*   @returns    {String}            The nick without the prefix
-*/
-User.stripPrefix = function (nick) {
-    var tmp = nick, i, j, k;
-    i = 0;
-    for (j = 0; j < nick.length; j++) {
-        for (k = 0; k < kiwi.gateway.user_prefixes.length; k++) {
-            if (nick.charAt(j) === kiwi.gateway.user_prefixes[k].symbol) {
-                i++;
-                break;
-            }
-        }
-    }
-
-    return tmp.substr(i);
-};
-
-/**
-*   Comparison function to order nicks based on their modes and/or nicks
-*   @param      {User}      a   The first User to evaluate
-*   @param      {User}      b   The second User to evaluate
-*   @returns    {Number}        -1 if a should be sorted before b, 1 if b should be sorted before a, and 0 if the two Users are the same.
-*/
-User.compare = function (a, b) {
-    var i, a_idx, b_idx, a_nick, b_nick;
-    // Try to sort by modes first
-    if (a.modes.length > 0) {
-        // a has modes, but b doesn't so a should appear first
-        if (b.modes.length === 0) {
-            return -1;
-        }
-        a_idx = b_idx = -1;
-        // Compare the first (highest) mode
-        for (i = 0; i < kiwi.gateway.user_prefixes.length; i++) {
-            if (kiwi.gateway.user_prefixes[i].mode === a.modes[0]) {
-                a_idx = i;
-            }
-        }
-        for (i = 0; i < kiwi.gateway.user_prefixes.length; i++) {
-            if (kiwi.gateway.user_prefixes[i].mode === b.modes[0]) {
-                b_idx = i;
-            }
-        }
-        if (a_idx < b_idx) {
-            return -1;
-        } else if (a_idx > b_idx) {
-            return 1;
-        }
-        // If we get to here both a and b have the same highest mode so have to resort to lexicographical sorting
-
-    } else if (b.modes.length > 0) {
-        // b has modes but a doesn't so b should appear first
-        return 1;
-    }
-    a_nick = a.nick.toLocaleUpperCase();
-    b_nick = b.nick.toLocaleUpperCase();
-    // Lexicographical sorting
-    if (a_nick < b_nick) {
-        return -1;
-    } else if (a_nick > b_nick) {
-        return 1;
-    } else {
-        // This should never happen; both users have the same nick.
-        console.log('Something\'s gone wrong somewhere - two users have the same nick!');
-        return 0;
-    }
-};
-
-
-
 /*
  *   MISC VIEW
  */
@@ -1321,370 +869,6 @@ Utilityview.prototype.clearPartImage = function () {
     $('#kiwi .toolbars .tab_part').remove();
 };
 
-
-
-
-
-/*
- *
- *   TABVIEWS
- *
- */
-
-/**
-*   @constructor
-*   A tab to show a channel or query window
-*   @param  {String}    v_name  The window's target's name (i.e. channel name or nickname)
-*/
-var Tabview = function (v_name) {
-    /*global Tabview, UserList */
-    var re, htmlsafe_name, tmp_divname, tmp_userlistname, tmp_tabname, tmp_tab, userlist_enabled = true;
-
-    if (v_name.charAt(0) === kiwi.gateway.channel_prefix) {
-        htmlsafe_name = 'chan_' + randomString(15);
-    } else {
-        htmlsafe_name = 'query_' + randomString(15);
-        userlist_enabled = false;
-    }
-
-    tmp_divname = 'kiwi_window_' + htmlsafe_name;
-    tmp_userlistname = 'kiwi_userlist_' + htmlsafe_name;
-    tmp_tabname = 'kiwi_tab_' + htmlsafe_name;
-
-    if (!Tabview.tabExists(v_name)) {
-        // Create the window
-        $('#kiwi .windows .scroller').append('<div id="' + tmp_divname + '" class="messages"></div>');
-        
-        // Create the window tab
-        
-        tmp_tab = $('<li id="' + tmp_tabname + '"><span></span></li>');
-        $('span', tmp_tab).text(v_name);
-        $('#kiwi .windowlist ul').append(tmp_tab);
-        tmp_tab.click(function (e) {
-            var tab = Tabview.getTab(v_name);
-            if (tab) {
-                tab.show();
-            }
-        });
-
-        kiwi.front.sortWindowList();
-    }
-
-    kiwi.front.tabviews[v_name.toLowerCase()] = this;
-    this.name = v_name;
-    this.div = $('#' + tmp_divname);
-    this.userlist = new UserList(htmlsafe_name);
-    this.tab = $('#' + tmp_tabname);
-    this.panel = $('#panel1');
-
-    if (!userlist_enabled) {
-        this.userlist.setWidth(0);
-    }
-    this.show();
-
-    if (typeof registerTouches === "function") {
-        //alert("Registering touch interface");
-        //registerTouches($('#'+tmp_divname));
-        registerTouches(document.getElementById(tmp_divname));
-    }
-
-    kiwi.front.ui.doLayoutSize();
-};
-Tabview.prototype.name = null;
-Tabview.prototype.div = null;
-Tabview.prototype.userlist = null;
-Tabview.prototype.tab = null;
-Tabview.prototype.topic = "";
-Tabview.prototype.safe_to_close = false;                // If we have been kicked/banned/etc from this channel, don't wait for a part message
-Tabview.prototype.panel = null;
-Tabview.prototype.msg_count = 0;
-/**
-*   Brings this view to the foreground
-*/
-Tabview.prototype.show = function () {
-    var w, u;
-
-    $('.messages', this.panel).removeClass("active");
-    $('#kiwi .userlist ul').removeClass("active");
-    $('#kiwi .toolbars ul li').removeClass("active");
-
-    w = $('#windows');
-    u = $('#kiwi .userlist');
-
-    this.panel.css('overflow-y', 'scroll');
-
-    // Set the window size accordingly
-    if (this.userlist.width > 0) {
-        this.userlist.setWidth();
-        w.css('right', u.outerWidth(true));
-        this.userlist.active(true);
-        // Enable the userlist resizer
-        $('#nicklist_resize').css('display', 'block');
-    } else {
-        w.css('right', 0);
-        // Disable the userlist resizer
-        $('#nicklist_resize').css('display', 'none');
-    }
-
-    this.div.addClass('active');
-    this.tab.addClass('active');
-
-    // Add the part image to the tab
-    this.addPartImage();
-
-    this.clearHighlight();
-    kiwi.front.ui.setTopicText(this.topic);
-    kiwi.front.cur_channel = this;
-
-    // If we're using fancy scrolling, refresh it
-    if (touch_scroll) {
-        touch_scroll.refresh();
-    }
-
-    this.scrollBottom();
-    if (!touchscreen) {
-        $('#kiwi_msginput').focus();
-    }
-};
-/**
-*   Removes the panel from the UI and destroys its contents
-*/
-Tabview.prototype.close = function () {
-    this.div.remove();
-    this.userlist.remove();
-    this.userlist = null;
-    this.tab.remove();
-
-    if (kiwi.front.cur_channel === this) {
-        kiwi.front.tabviews.server.show();
-    }
-    delete kiwi.front.tabviews[this.name.toLowerCase()];
-};
-/**
-*   Adds the close image to the tab
-*/
-Tabview.prototype.addPartImage = function () {
-    this.clearPartImage();
-
-    // We can't close this tab, so don't have the close image
-    if (this.name === 'server') {
-        return;
-    }
-
-    var del_html = '<img src="/img/redcross.png" class="tab_part" />';
-    this.tab.append(del_html);
-
-    $('.tab_part', this.tab).click(function () {
-        if (kiwi.front.isChannel($(this).parent().text())) {
-            kiwi.front.run("/part");
-        } else {
-            // Make sure we don't close the server tab
-            if (kiwi.front.cur_channel.name !== 'server') {
-                kiwi.front.cur_channel.close();
-            }
-        }
-    });
-};
-/**
-*   Removes the close image from the tab
-*/
-Tabview.prototype.clearPartImage = function () {
-    $('#kiwi .toolbars .tab_part').remove();
-};
-/**
-*   Sets the tab's icon
-*   @param  {String}    url     The URL of the icon to display
-*/
-Tabview.prototype.setIcon = function (url) {
-    this.tab.prepend('<img src="' + url + '" class="icon" />');
-    this.tab.css('padding-left', '33px');
-};
-/**
-*   Sets the tab's label
-*/
-Tabview.prototype.setTabText = function (text) {
-    $('span', this.tab).text(text);
-};
-/**
-*   Adds a message to the window.
-*   This method will automatically format the message (bold, underline, colours etc.)
-*   @param      {Date}      time    The timestamp of the message. May be null.
-*   @param      {String}    nick    The origin of the message
-*   @param      {String}    msg     The message to display
-*   @param      {String}    type    The CSS class to assign to the whole message line
-*   @param      {String}    style   Extra CSS commands to apply just to the msg
-*/
-Tabview.prototype.addMsg = function (time, nick, msg, type, style) {
-    var self, tmp, d, re, line_msg;
-
-    self = this;
-
-    tmp = {msg: msg, time: time, nick: nick, tabview: this.name};
-    tmp = kiwi.plugs.run('addmsg', tmp);
-    if (!tmp) {
-        return;
-    }
-
-
-    msg = tmp.msg;
-    time = tmp.time;
-    nick = tmp.nick;
-
-    if (time === null) {
-        d = new Date();
-        time = d.getHours().toString().lpad(2, "0") + ":" + d.getMinutes().toString().lpad(2, "0") + ":" + d.getSeconds().toString().lpad(2, "0");
-    }
-
-    // The CSS class (action, topic, notice, etc)
-    if (typeof type !== "string") {
-        type = '';
-    }
-
-    // Make sure we don't have NaN or something
-    if (typeof msg !== "string") {
-        msg = '';
-    }
-
-    // Make the channels clickable
-    re = new RegExp('\\B(' + kiwi.gateway.channel_prefix + '[^ ,.\\007]+)', 'g');
-    msg = msg.replace(re, function (match) {
-        return '<a class="chan">' + match + '</a>';
-    });
-
-    msg = kiwi.front.formatIRCMsg(msg);
-
-    // Build up and add the line
-    line_msg = $('<div class="msg ' + type + '"><div class="time">' + time + '</div><div class="nick">' + nick + '</div><div class="text" style="' + style + '">' + msg + ' </div></div>');
-    this.div.append(line_msg);
-
-    this.msg_count++;
-    if (this.msg_count > 250) {
-        $('.msg:first', this.div).remove();
-        this.msg_count--;
-    }
-
-    if (!touchscreen) {
-        this.scrollBottom();
-    } else {
-        touch_scroll.refresh();
-        //console.log(this.div.attr("scrollHeight") +" - "+ $('#windows').height());
-        this.scrollBottom();
-        //if(this.div.attr("scrollHeight") > $('#windows').height()){
-        //    touch_scroll.scrollTo(0, this.div.height());
-        //}
-    }
-};
-/**
-*   Scroll to the bottom of the window
-*/
-Tabview.prototype.scrollBottom = function () {
-    var panel = this.panel;
-    panel[0].scrollTop = panel[0].scrollHeight;
-};
-/**
-*   Change a user's nick on the channel
-*   @param      {String}    newNick     The new nick
-*   @param      {String}    oldNick     The old nick
-*/
-Tabview.prototype.changeNick = function (newNick, oldNick) {
-    var inChan = this.userlist.hasUser(oldNick);
-    if (inChan) {
-        this.userlist.renameUser(oldNick, newNick);
-        this.addMsg(null, ' ', '=== ' + oldNick + ' is now known as ' + newNick, 'action changenick');
-    }
-};
-/**
-*   Highlight the tab
-*/
-Tabview.prototype.highlight = function () {
-    this.tab.addClass('highlight');
-};
-/**
-*   Indicate activity on the tab
-*/
-Tabview.prototype.activity = function () {
-    this.tab.addClass('activity');
-};
-/**
-*   Clear the tab's highlight
-*/
-Tabview.prototype.clearHighlight = function () {
-    this.tab.removeClass('highlight');
-    this.tab.removeClass('activity');
-};
-/**
-*   Change the channel's topic
-*   @param      {String}    new_topic   The new channel topic
-*/
-Tabview.prototype.changeTopic = function (new_topic) {
-    this.topic = new_topic;
-    this.addMsg(null, ' ', '=== Topic for ' + this.name + ' is: ' + new_topic, 'topic');
-    if (kiwi.front.cur_channel.name === this.name) {
-        kiwi.front.ui.setTopicText(new_topic);
-    }
-};
-// Static functions
-/**
-*   Checks to see if a tab by the given name exists
-*   @param      {String}    name    The name to check
-*   @returns    {Boolean}           True if the tab exists, false otherwise
-*/
-Tabview.tabExists = function (name) {
-    return (Tabview.getTab(name) !== null);
-};
-/**
-*   Returns the tab which has the given name
-*   @param      {String}    name    The name of the tab to return
-*   @returns    {Tabview}           The Tabview with the given name, or null if it does not exist
-*/
-Tabview.getTab = function (name) {
-    var tab;
-
-    // Make sure we actually have a name
-    if (typeof name !== 'string') {
-        return null;
-    }
-
-    // Go through each tabview and pick out the matching one
-    $.each(kiwi.front.tabviews, function (i, item) {
-        if (item.name.toLowerCase() === name.toLowerCase()) {
-            tab = item;
-            return false;
-        }
-    });
-
-    // If we we didn't find one, return null instead
-    tab = tab || null;
-
-    return tab;
-};
-/**
-*   Returns the tab that corresponds to the server
-*   @retruns    {Tabview}       The server Tabview
-*/
-Tabview.getServerTab = function () {
-    return Tabview.getTab('server');
-};
-/**
-*   Returns all tabs
-*   @returns    {Array}         All of the tabs
-*/
-Tabview.getAllTabs = function () {
-    return kiwi.front.tabviews;
-};
-/**
-*   Returns the tab that's currently showing
-*   @returns    {Tabview}       The tab that's currently showing
-*/
-Tabview.getCurrentTab = function () {
-    return kiwi.front.cur_channel;
-};
-
-
-
-
-
-
 /**
 *   @constructor
 *   Floating message box
diff --git a/client/js/front.ui.js b/client/js/front.ui.js
old mode 100644
new mode 100755
index 2d5ea43..e7d2eb4
--- a/client/js/front.ui.js
+++ b/client/js/front.ui.js
@@ -345,7 +345,7 @@ kiwi.front.ui = {
     *   Displays the next tab
     */
     windowsNext: function () {
-        var tab, tabs, curTab, next;
+        /*var tab, tabs, curTab, next;
         next = false;
         tabs = Tabview.getAllTabs();
         curTab = Tabview.getCurrentTab();
@@ -359,14 +359,14 @@ kiwi.front.ui = {
                 tabs[tab].show();
                 return;
             }
-        }
+        }*/
     },
 
     /**
     *   Displays the previous tab
     */
     windowsPrevious: function () {
-        var tab, tabs, curTab, prev_tab, next;
+        /*var tab, tabs, curTab, prev_tab, next;
         next = false;
         tabs = Tabview.getAllTabs();
         curTab = Tabview.getCurrentTab();
@@ -378,7 +378,7 @@ kiwi.front.ui = {
                 return;
             }
             prev_tab = tabs[tab];
-        }
+        }*/
     },
 
     /**
@@ -386,7 +386,7 @@ kiwi.front.ui = {
     *   @param  {Number}    num The index of the tab to show
     */
     windowsShow: function (num) {
-        num = parseInt(num, 10);
+        /*num = parseInt(num, 10);
         console.log('Showing window ' + num.toString());
         var i = 0, tab, tabs;
         tabs = Tabview.getAllTabs();
@@ -396,7 +396,7 @@ kiwi.front.ui = {
                 return;
             }
             i++;
-        }
+        }*/
     },
 
 
diff --git a/client/js/model.js b/client/js/model.js
index 15443a2..d5d490a 100755
--- a/client/js/model.js
+++ b/client/js/model.js
@@ -133,13 +133,15 @@ kiwi.model.ChannelList = Backbone.Collection.extend({
     }
 });
 
+// TODO: Channel modes
 kiwi.model.Channel = Backbone.Model.extend({
     initialize: function (attributes) {
         var name = this.get("name") || "";
         this.set({
             "members": new kiwi.model.MemberList(),
             "name": name,
-            "backscroll": []
+            "backscroll": [],
+            "topic": ""
         }, {"silent": true});
         this.view = new kiwi.view.Channel({"model": this, "name": name});
     },
diff --git a/client/js/view.js b/client/js/view.js
index 27585a6..ac2a839 100755
--- a/client/js/view.js
+++ b/client/js/view.js
@@ -32,7 +32,8 @@ kiwi.view.Channel = Backbone.View.extend({
     },
     initialize: function (options) {
         this.htmlsafe_name = 'chan_' + randomString(15);
-        $(this.el).attr("id", 'kiwi_window_' + this.htmlsafe_name);
+        $(this.el).attr("id", 'kiwi_window_' + this.htmlsafe_name).css('display', 'none');
+        this.el = $(this.el).appendTo('#panel1 .scroller')[0];
         this.model.bind('msg', this.newMsg, this);
         this.msg_count = 0;
         this.model.set({"view": this}, {"silent": true});
@@ -63,6 +64,10 @@ kiwi.view.Channel = Backbone.View.extend({
     },
     chanClick: function (x) {
         console.log(x);
+    },
+    show: function () {
+        $('#panel1 .scroller').children().css('display','none');
+        $(this.el).css('display', 'block');
     }
 });
 
@@ -80,19 +85,19 @@ kiwi.view.Tabs = Backbone.View.extend({
         $this.empty();
         this.model.forEach(function (tab) {
             var tabname = $(tab.get("view").el).attr("id");
-            $this.append($('<li id="tab_' + tabname + '"><span>' + tab.get("name") + '</span></li>'));
+            $('<li id="tab_' + tabname + '"><span>' + tab.get("name") + '</span></li>').data('chan', tab).appendTo($this)
         });
     },
     addTab: function (tab) {
         var tabname = $(tab.get("view").el).attr("id"),
             $this = $(this.el);
-        $this.append($('<li id="tab_' + tabname + '"><span>' + tab.get("name") + '</span></li>'));
+        $('<li id="tab_' + tabname + '"><span>' + tab.get("name") + '</span></li>').data('chan', tab).appendTo($this)
     },
     removeTab: function (tab) {
         $('#tab_' + $(tab.get("view").el).attr("id")).remove();
     },
-    tabClick: function (x) {
-        console.log(x);
+    tabClick: function (e) {
+        $(e.currentTarget).data('chan').view.show();
     }
 });
 
diff --git a/server/app.js b/server/app.js
index cab69b5..eaf4633 100755
--- a/server/app.js
+++ b/server/app.js
@@ -595,7 +595,7 @@ this.httpHandler = function (request, response) {
 
                     min.underscore = fs.readFileSync(public_http_path + 'js/underscore.min.js');
                     min.util = fs.readFileSync(public_http_path + 'js/util.js');
-                    min.backbone = fs.readFileSync(public_http_path + 'js/backbone-0.5.3-min.js');
+                    min.backbone = fs.readFileSync(public_http_path + 'js/backbone-git.js');
                     min.gateway = fs.readFileSync(public_http_path + 'js/gateway.js');
                     min.model = fs.readFileSync(public_http_path + 'js/model.js');
                     min.view = fs.readFileSync(public_http_path + 'js/view.js');