--- a/client/js/main.js	Mon Aug 20 16:07:15 2012 +0200
+++ b/client/js/main.js	Tue Aug 21 12:46:11 2012 +0200
@@ -33,50 +33,6 @@
 
 Rkns._ = _;
 
-Rkns.RemoteModels = {};
-
-Rkns.RemoteModels._Base = function(_project, _opts) {
-    if (typeof _project !== "undefined") {
-        this._project = _project;
-        this._callbackQueue = [];
-        this._loaded = false;
-    }
-}
-
-Rkns.RemoteModels._Base.prototype.fullSave
-    = Rkns.RemoteModels._Base.prototype.addUser
-    = Rkns.RemoteModels._Base.prototype.addNode
-    = Rkns.RemoteModels._Base.prototype.addEdge
-    = Rkns.RemoteModels._Base.prototype.updateNode
-    = Rkns.RemoteModels._Base.prototype.updateEdge
-    = Rkns.RemoteModels._Base.prototype.removeNode
-    = Rkns.RemoteModels._Base.prototype.removeEdge
-    = function() {}
-
-Rkns.RemoteModels._Base.prototype.deferCallback = function(_callback) {
-    var _this = this;
-    Rkns._.defer(function() {
-        _callback.call(_this);
-    });
-}
-
-Rkns.RemoteModels._Base.prototype.handleCallbacks = function() {
-    this._loaded = true;
-    while (this._callbackQueue.length) {
-        this.deferCallback(this._callbackQueue.splice(0,1)[0]);
-    }
-}
-
-Rkns.RemoteModels._Base.prototype.onLoad = function(_callback) {
-    if (this._loaded) {
-        this.deferCallback(_callback);
-    } else {
-        this._callbackQueue.push(_callback);
-    }
-}
-
-Rkns.RemoteModels._Base.prototype.save = function() {}
-
 Rkns.Bins = {}
 
 Rkns.Bins._Base = function(_renkan, _opts) {
@@ -110,16 +66,14 @@
     if (typeof _opts.search !== "object" || !_opts.search) {
         _opts.search = [];
     }
-    this.project = new Rkns.ViewModel.Project();
-    this.project.l10n = Rkns.i18n[_opts.language];
-    if (typeof _opts.user === "object") {
-        this.current_user = this.project.addUser(_opts.user)
+    this.project = new Rkns.Models.Project();
+    this.l10n = Rkns.i18n[_opts.language];
+    if (typeof _opts.user_id !== "undefined") {
+        this.current_user = _opts.user_id;
     }
     this.$ = Rkns.$("#" + _opts.container);
     this.$.html(this.template());
-    this.remotemodel = this.project.remotemodel = new Rkns.RemoteModels[_opts.remotemodel](this.project, _opts);
-    this.renderer = this.project.renderer = new Rkns.Renderer.Scene(this.project, _opts);
-    this.renderer.renkan = this;
+    this.renderer = new Rkns.Renderer.Scene(this);
     this.tabs = [];
     this.selected_bin_item = undefined;
     this.mousedown = false;
@@ -173,13 +127,6 @@
         });
     Rkns.$(window).resize(function() {
         _this.resizeBins();
-    })
-    
-    this.project.remotemodel.onLoad(function() {
-        if (typeof _this.project.current_user === "undefined") {
-            _this.project.current_user = _this.project.users[0];
-        }
-        _this.project.renderer.draw();
     });
 }