Deploy 0.6.19

Deploy 0.6.18
Deploy 0.6.17
2015-11-04 14:36:01 +01:00 · 2015-11-04 14:35:08 +01:00 · 2015-11-04 14:33:44 +01:00 · 2015-11-04 14:32:04 +01:00 · 2015-11-04 14:10:01 +01:00 · 2015-11-02 13:14:52 +00:00
73 changed files with 5485 additions and 116591 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,12 @@
-/node_modules/
+node_modules
 bower_components
+build
+build_test
 .directory
-.c9
 .codio
-.settings
+.settings
+.jshintignore
+.jshintrc
+.validate.json
+/y.js
+/y.js.map
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "dist"]
+	path = dist
+	url = https://github.com/y-js/yjs.git
+	branch = dist
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,8 @@
 language: node_js
 before_install:
-  - "npm install -g bower coffee-script"
-  - "bower install"
+  - "npm install -g bower"
 node_js:
  - "0.12"
-  - "0.11"
-  - "0.10"
 branches:
  only:
-    - master
+    - master
--- a/Examples/OfflineEditing/index.html
+++ b/Examples/OfflineEditing/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <button id="button">Disconnect</button>
+  <h1 id="contenteditable" contentEditable></h1>
+  <textarea style="width:80%;" rows=40 id="textfield"></textarea>
+
+  <script src="../../node_modules/simplewebrtc/simplewebrtc.bundle.js"></script>
+  <script src="../../y.js"></script>
+  <script src="./index.js"></script>
+</body>
+</html>
--- a/Examples/OfflineEditing/index.js
+++ b/Examples/OfflineEditing/index.js
@@ -0,0 +1,50 @@
+/* global Y */
+
+// create a shared object. This function call will return a promise!
+Y({
+  db: {
+    name: 'IndexedDB',
+    namespace: 'offlineEditingDemo'
+  },
+  connector: {
+    name: 'WebRTC',
+    room: 'offlineEditingDemo',
+    debug: true
+  }
+}).then(function (yconfig) {
+  // yconfig holds all the information about the shared object
+  window.yconfig = yconfig
+  // yconfig.root holds the shared element
+  window.y = yconfig.root
+
+  // now we bind the textarea and the contenteditable h1 element
+  // to a shared element
+  var textarea = document.getElementById('textfield')
+  var contenteditable = document.getElementById('contenteditable')
+  yconfig.root.observePath(['text'], function (text) {
+    // every time the 'text' property of the yconfig.root changes,
+    // this function is called. Then we bind it to the html elements
+    if (text != null) {
+      // when the text property is deleted, text may be undefined!
+      // This is why we have to check if text exists..
+      text.bind(textarea)
+      text.bind(contenteditable)
+    }
+  })
+  // create a shared TextBind
+  var textpromise = yconfig.root.get('text')
+  if (textpromise == null) {
+    yconfig.root.set('text', Y.TextBind)
+  }
+  // We also provide a button for disconnecting/reconnecting the shared element
+  var button = document.querySelector('#button')
+  button.onclick = function () {
+    if (button.innerText === 'Disconnect') {
+      yconfig.disconnect()
+      button.innerText = 'Reconnect'
+    } else {
+      yconfig.reconnect()
+      button.innerText = 'Disconnect'
+    }
+  }
+})
--- a/Examples/TextBind/index.html
+++ b/Examples/TextBind/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <button id="button">Disconnect</button>
+  <h1 id="contenteditable" contentEditable></h1>
+  <textarea style="width:80%;" rows=40 id="textfield"></textarea>
+
+  <script src="../../node_modules/simplewebrtc/simplewebrtc.bundle.js"></script>
+  <script src="../../y.js"></script>
+  <script src="./index.js"></script>
+</body>
+</html>
--- a/Examples/TextBind/index.js
+++ b/Examples/TextBind/index.js
@@ -0,0 +1,47 @@
+/* global Y */
+
+// create a shared object. This function call will return a promise!
+Y({
+  db: {
+    name: 'Memory'
+  },
+  connector: {
+    name: 'WebRTC',
+    room: 'TextBindDemo',
+    debug: true
+  }
+}).then(function (yconfig) {
+  // yconfig holds all the information about the shared object
+  window.yconfig = yconfig
+  // yconfig.root holds the shared element
+  window.y = yconfig.root
+
+  // now we bind the textarea and the contenteditable h1 element
+  // to a shared element
+  var textarea = document.getElementById('textfield')
+  var contenteditable = document.getElementById('contenteditable')
+  yconfig.root.observePath(['text'], function (text) {
+    // every time the 'text' property of the yconfig.root changes,
+    // this function is called. Then we bind it to the html elements
+    if (text != null) {
+      // when the text property is deleted, text may be undefined!
+      // This is why we have to check if text exists..
+      text.bind(textarea)
+      text.bind(contenteditable)
+    }
+  })
+  // create a shared TextBind
+  yconfig.root.set('text', Y.TextBind)
+
+  // We also provide a button for disconnecting/reconnecting the shared element
+  var button = document.querySelector('#button')
+  button.onclick = function () {
+    if (button.innerText === 'Disconnect') {
+      yconfig.disconnect()
+      button.innerText = 'Reconnect'
+    } else {
+      yconfig.reconnect()
+      button.innerText = 'Disconnect'
+    }
+  }
+})
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,8 @@
 The MIT License (MIT)

-Copyright (c) 2014 Kevin Jahns <kevin.jahns@rwth-aachen.de>.
+Copyright (c) 2014
+  - Kevin Jahns <kevin.jahns@rwth-aachen.de>.
+  - Chair of Computer Science 5 (Databases & Information Systems), RWTH Aachen University, Germany

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@

 [![Build Status](https://travis-ci.org/y-js/yjs.svg)](https://travis-ci.org/y-js/yjs)

-Yjs is a framework for optimistic concurrency control and automatic conflict resolution on arbitrary data types. The framework implements a new OT-like concurrency algorithm and provides similar functionality as [ShareJs] and [OpenCoweb]. Yjs was designed to handle concurrent actions on arbitrary complex data types like Text, Json, and XML. We provide a tutorial and some applications for this framework on our [homepage](http://y-js.org/).
+Yjs is a framework for optimistic concurrency control and automatic conflict resolution on shared data types. The framework implements a new OT-like concurrency algorithm and provides similar functionality as [ShareJs] and [OpenCoweb]. Yjs was designed to handle concurrent actions on arbitrary complex data types like Text, Json, and XML. We provide a tutorial and some applications for this framework on our [homepage](http://y-js.org/).

-You can create you own data types easily. Therefore, you can take matters into your own hand by defining the meaning of the shared types and ensure that it is valid, while Yjs ensures data consistency (everyone will eventually end up with the same data). We already provide data types for
+You can create you own shared types easily. Therefore, you can take matters into your own hand by defining the meaning of the shared types and ensure that it is valid, while Yjs ensures data consistency (everyone will eventually end up with the same data). We already provide data types for

 | Name                                                 | Description
 | ---------------------------------------------------- | ---------------------------------------------
@@ -32,8 +32,8 @@ You can use Yjs client-, and server- side. You can get it as via npm, and bower.
 The advantages over similar frameworks are support for
 * .. P2P message propagation and arbitrary communication protocols
 * .. arbitrary complex data types
-* .. offline editing: Only relevant changes are propagated on rejoin (unimplemented)
-* .. AnyUndo: Undo *any* action that was executed in constant time (unimplemented)
+* .. offline editing: Changes are stored persistently and only relevant changes are propagated on rejoin
+* .. AnyUndo: Undo *any* action that was executed in constant time (coming..)
 * .. Intention Preservation: When working on Text, the intention of your changes are preserved. This is particularily important when working offline. Every type has a notion on how we define Intention Preservation on it.


@@ -68,33 +68,31 @@ var y = new Y(connector);
 ```


-# Y.Object
-Yjs includes only one type by default - the Y.Object type. It mimics the behaviour of a JSON Object. You can create, update, and remove properies on the Y.Object type. Furthermore, you can observe changes on this type as you can observe changes on Javascript Objects with [Object.observe](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/observe) - an ECMAScript 7 proposal which is likely to become accepted by the committee. Until then, we have our own implementation.
+# Y.Map
+Yjs includes only one type by default - the Y.Map type. It mimics the behaviour of a javascript Object. You can create, update, and remove properies on the Y.Map type. Furthermore, you can observe changes on this type as you can observe changes on Javascript Objects with [Object.observe](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/observe) - an ECMAScript 7 proposal which is likely to become accepted by the committee. Until then, we have our own implementation.


 ##### Reference
 * Create
 ```
-var y = new Y.Object();
+var map = y.set("new_map", Y.Map).then(function(map){
+  map // is my map type
+});
 ```
-* Create with existing Object
+* Every instance of Y is an Y.Map
 ```
-var y = new Y.Object({number: 73});
+var y = new Y(options);
 ```
-* Every instance of Y is an Y.Object
-```
-var y = new Y(connector);
-```
-* .val()
-  * Retrieve all properties of this type as a JSON Object
-* .val(name)
-  * Retrieve the value of a property
-* .val(name, value)
-  * Set/update a property. Returns `this` Y.Object
+* .get(name)
+  * Retrieve the value of a property. If the value is a type, `.get(name)` returns a promise
+* .set(name, value)
+  * Set/update a property. `value` may be a primitive type, or a custom type definition (e.g. `Y.Map`)
 * .delete(name)
  * Delete a property
 * .observe(observer)
  * The `observer` is called whenever something on this object changes. Throws *add*, *update*, and *delete* events
+* .observePath(path, observer)
+  * `path` is an array of property names. `observer` is called when the property under `path` is set, deleted, or updated
 * .unobserve(f)
  * Delete an observer

@@ -102,11 +100,9 @@ var y = new Y(connector);
 When users create/update/delete the same property concurrently, only one change will prevail. Changes on different properties do not conflict with each other.

 # A note on time complexities
-* .val()
-  * O(|properties|)
-* .val(name)
+* .get(name)
  * O(1)
-* .val(name, value)
+* .set(name, value)
  * O(1)
 * .delete(name)
  * O(1)
@@ -121,10 +117,23 @@ When users create/update/delete the same property concurrently, only one change
 Yjs is a work in progress. Different versions of the *y-* repositories may not work together. Just drop me a line if you run into troubles.

 ## Get help
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/y-js/yjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+There are some friendly people on [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/y-js/yjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) who may help you with your problem, and answer your questions.

 Please report _any_ issues to the [Github issue page](https://github.com/y-js/yjs/issues)! I try to fix them very soon, if possible.

+## Changelog
+##### 1.0
+This is a complete rewrite of the 0.5 version of Yjs. Since Yjs 1.0 it is possible to work asynchronously on a persistent database, which enables offline support.
+* Switched to semver versioning
+* Requires a promise implementation in environment (es6 promises suffice, included in all the major browsers). Otherwise you have to include a polyfill
+* Y.Object has been renamed to Y.Map
+* Y.Map exchanges `.val(name [, value])` in favor of `.set(name, value)` and `.get(name)`
+* Y.Map `.get(name)` returns a promise, if the value is a custom type
+* The Connector definition slightly changed (I'll update the wiki)
+* The Type definitions completely changed, so you have to rewrite them (I'll rewrite the article in the wiki)
+* Support for several packaging systems
+
+
 ## Contribution
 I created this framework during my bachelor thesis at the chair of computer science 5 [(i5)](http://dbis.rwth-aachen.de/cms), RWTH University. Since December 2014 I'm working on Yjs as a part of my student worker job at the i5.

@@ -133,5 +142,4 @@ Yjs is licensed under the [MIT License](./LICENSE.txt).

 <yjs@dbis.rwth-aachen.de>

-[ShareJs]: https://github.com/share/ShareJS
-[OpenCoweb]: https://github.com/opencoweb/coweb
+[ShareJs]: https://github.com/sh
--- a/bower.json
+++ b/bower.json
@@ -1,33 +0,0 @@
-{
-  "name": "yjs",
-  "version": "0.5.2",
-  "homepage": "https://github.com/DadaMonad/yjs",
-  "authors": [
-    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
-  ],
-  "description": "A Framework that enables Real-Time collaboration on arbitrary data structures.",
-  "main": [
-    "./y.js",
-    "./y-object.html",
-    "./build/node/y.js"
-  ],
-  "keywords": [
-    "OT",
-    "collaboration",
-    "synchronization",
-    "ShareJS",
-    "Coweb",
-    "concurrency"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "node_modules",
-    "bower_components",
-    "test",
-    "extras",
-    "test"
-  ],
-  "devDependencies": {
-    "y-test" : "y-test#~0.4.0"
-  }
-}
--- a/build/README.md
+++ b/build/README.md
@@ -1,11 +0,0 @@
-
-# Directories
-
-### build/browser
-You find the browserified (not minified) version of yjs here. This is nice for debugging, since it also includes sourcemaps. For production, however, you should use the version that you find in the main directory.
-
-### build/node
-Yjs for nodejs is located here. You can only use the submodules, or require 'y' in your node project. Also works with browserify.
-
-### build/test
-Start build/test/index.html' in your browser, to perform testing Yjs.
--- a/build/browser/y-object.html
+++ b/build/browser/y-object.html
@@ -1,7 +0,0 @@
-
-<polymer-element name="y-object" hidden attributes="val connector y">
-</polymer-element>
-<polymer-element name="y-property" hidden attributes="val name y">
-</polymer-element>
-
-<script src="./y-object.js"></script>
--- a/build/browser/y-object.js
+++ b/build/browser/y-object.js
--- a/build/browser/y.js
+++ b/build/browser/y.js
--- a/build/node/ConnectorAdapter.js
+++ b/build/node/ConnectorAdapter.js
@@ -1,71 +0,0 @@
-var ConnectorClass, adaptConnector;
-
-ConnectorClass = require("./ConnectorClass");
-
-adaptConnector = function(connector, engine, HB, execution_listener) {
-  var applyHB, encode_state_vector, f, getHB, getStateVector, name, parse_state_vector, send_;
-  for (name in ConnectorClass) {
-    f = ConnectorClass[name];
-    connector[name] = f;
-  }
-  connector.setIsBoundToY();
-  send_ = function(o) {
-    if ((o.uid.creator === HB.getUserId()) && (typeof o.uid.op_number !== "string") && (HB.getUserId() !== "_temp")) {
-      return connector.broadcast(o);
-    }
-  };
-  if (connector.invokeSync != null) {
-    HB.setInvokeSyncHandler(connector.invokeSync);
-  }
-  execution_listener.push(send_);
-  encode_state_vector = function(v) {
-    var results, value;
-    results = [];
-    for (name in v) {
-      value = v[name];
-      results.push({
-        user: name,
-        state: value
-      });
-    }
-    return results;
-  };
-  parse_state_vector = function(v) {
-    var i, len, s, state_vector;
-    state_vector = {};
-    for (i = 0, len = v.length; i < len; i++) {
-      s = v[i];
-      state_vector[s.user] = s.state;
-    }
-    return state_vector;
-  };
-  getStateVector = function() {
-    return encode_state_vector(HB.getOperationCounter());
-  };
-  getHB = function(v) {
-    var hb, json, state_vector;
-    state_vector = parse_state_vector(v);
-    hb = HB._encode(state_vector);
-    json = {
-      hb: hb,
-      state_vector: encode_state_vector(HB.getOperationCounter())
-    };
-    return json;
-  };
-  applyHB = function(hb, fromHB) {
-    return engine.applyOp(hb, fromHB);
-  };
-  connector.getStateVector = getStateVector;
-  connector.getHB = getHB;
-  connector.applyHB = applyHB;
-  if (connector.receive_handlers == null) {
-    connector.receive_handlers = [];
-  }
-  return connector.receive_handlers.push(function(sender, op) {
-    if (op.uid.creator !== HB.getUserId()) {
-      return engine.applyOp(op);
-    }
-  });
-};
-
-module.exports = adaptConnector;
--- a/build/node/ConnectorClass.js
+++ b/build/node/ConnectorClass.js
@@ -1,415 +0,0 @@
-module.exports = {
-  init: function(options) {
-    var req;
-    req = (function(_this) {
-      return function(name, choices) {
-        if (options[name] != null) {
-          if ((choices == null) || choices.some(function(c) {
-            return c === options[name];
-          })) {
-            return _this[name] = options[name];
-          } else {
-            throw new Error("You can set the '" + name + "' option to one of the following choices: " + JSON.encode(choices));
-          }
-        } else {
-          throw new Error("You must specify " + name + ", when initializing the Connector!");
-        }
-      };
-    })(this);
-    req("syncMethod", ["syncAll", "master-slave"]);
-    req("role", ["master", "slave"]);
-    req("user_id");
-    if (typeof this.on_user_id_set === "function") {
-      this.on_user_id_set(this.user_id);
-    }
-    if (options.perform_send_again != null) {
-      this.perform_send_again = options.perform_send_again;
-    } else {
-      this.perform_send_again = true;
-    }
-    if (this.role === "master") {
-      this.syncMethod = "syncAll";
-    }
-    this.is_synced = false;
-    this.connections = {};
-    if (this.receive_handlers == null) {
-      this.receive_handlers = [];
-    }
-    this.connections = {};
-    this.current_sync_target = null;
-    this.sent_hb_to_all_users = false;
-    return this.is_initialized = true;
-  },
-  onUserEvent: function(f) {
-    if (this.connections_listeners == null) {
-      this.connections_listeners = [];
-    }
-    return this.connections_listeners.push(f);
-  },
-  isRoleMaster: function() {
-    return this.role === "master";
-  },
-  isRoleSlave: function() {
-    return this.role === "slave";
-  },
-  findNewSyncTarget: function() {
-    var c, ref, user;
-    this.current_sync_target = null;
-    if (this.syncMethod === "syncAll") {
-      ref = this.connections;
-      for (user in ref) {
-        c = ref[user];
-        if (!c.is_synced) {
-          this.performSync(user);
-          break;
-        }
-      }
-    }
-    if (this.current_sync_target == null) {
-      this.setStateSynced();
-    }
-    return null;
-  },
-  userLeft: function(user) {
-    var f, i, len, ref, results;
-    delete this.connections[user];
-    this.findNewSyncTarget();
-    if (this.connections_listeners != null) {
-      ref = this.connections_listeners;
-      results = [];
-      for (i = 0, len = ref.length; i < len; i++) {
-        f = ref[i];
-        results.push(f({
-          action: "userLeft",
-          user: user
-        }));
-      }
-      return results;
-    }
-  },
-  userJoined: function(user, role) {
-    var base, f, i, len, ref, results;
-    if (role == null) {
-      throw new Error("Internal: You must specify the role of the joined user! E.g. userJoined('uid:3939','slave')");
-    }
-    if ((base = this.connections)[user] == null) {
-      base[user] = {};
-    }
-    this.connections[user].is_synced = false;
-    if ((!this.is_synced) || this.syncMethod === "syncAll") {
-      if (this.syncMethod === "syncAll") {
-        this.performSync(user);
-      } else if (role === "master") {
-        this.performSyncWithMaster(user);
-      }
-    }
-    if (this.connections_listeners != null) {
-      ref = this.connections_listeners;
-      results = [];
-      for (i = 0, len = ref.length; i < len; i++) {
-        f = ref[i];
-        results.push(f({
-          action: "userJoined",
-          user: user,
-          role: role
-        }));
-      }
-      return results;
-    }
-  },
-  whenSynced: function(args) {
-    if (args.constructor === Function) {
-      args = [args];
-    }
-    if (this.is_synced) {
-      return args[0].apply(this, args.slice(1));
-    } else {
-      if (this.compute_when_synced == null) {
-        this.compute_when_synced = [];
-      }
-      return this.compute_when_synced.push(args);
-    }
-  },
-  onReceive: function(f) {
-    return this.receive_handlers.push(f);
-  },
-
-  /*
-   * Broadcast a message to all connected peers.
-   * @param message {Object} The message to broadcast.
-  #
-  broadcast: (message)->
-    throw new Error "You must implement broadcast!"
-  
-  #
-   * Send a message to a peer, or set of peers
-  #
-  send: (peer_s, message)->
-    throw new Error "You must implement send!"
-   */
-  performSync: function(user) {
-    var _hb, hb, i, len, o;
-    if (this.current_sync_target == null) {
-      this.current_sync_target = user;
-      this.send(user, {
-        sync_step: "getHB",
-        send_again: "true",
-        data: this.getStateVector()
-      });
-      if (!this.sent_hb_to_all_users) {
-        this.sent_hb_to_all_users = true;
-        hb = this.getHB([]).hb;
-        _hb = [];
-        for (i = 0, len = hb.length; i < len; i++) {
-          o = hb[i];
-          _hb.push(o);
-          if (_hb.length > 10) {
-            this.broadcast({
-              sync_step: "applyHB_",
-              data: _hb
-            });
-            _hb = [];
-          }
-        }
-        return this.broadcast({
-          sync_step: "applyHB",
-          data: _hb
-        });
-      }
-    }
-  },
-  performSyncWithMaster: function(user) {
-    var _hb, hb, i, len, o;
-    this.current_sync_target = user;
-    this.send(user, {
-      sync_step: "getHB",
-      send_again: "true",
-      data: this.getStateVector()
-    });
-    hb = this.getHB([]).hb;
-    _hb = [];
-    for (i = 0, len = hb.length; i < len; i++) {
-      o = hb[i];
-      _hb.push(o);
-      if (_hb.length > 10) {
-        this.broadcast({
-          sync_step: "applyHB_",
-          data: _hb
-        });
-        _hb = [];
-      }
-    }
-    return this.broadcast({
-      sync_step: "applyHB",
-      data: _hb
-    });
-  },
-  setStateSynced: function() {
-    var args, el, f, i, len, ref;
-    if (!this.is_synced) {
-      this.is_synced = true;
-      if (this.compute_when_synced != null) {
-        ref = this.compute_when_synced;
-        for (i = 0, len = ref.length; i < len; i++) {
-          el = ref[i];
-          f = el[0];
-          args = el.slice(1);
-          f.apply(args);
-        }
-        delete this.compute_when_synced;
-      }
-      return null;
-    }
-  },
-  whenReceivedStateVector: function(f) {
-    if (this.when_received_state_vector_listeners == null) {
-      this.when_received_state_vector_listeners = [];
-    }
-    return this.when_received_state_vector_listeners.push(f);
-  },
-  receiveMessage: function(sender, res) {
-    var _hb, data, f, hb, i, j, k, len, len1, len2, o, ref, ref1, results, sendApplyHB, send_again;
-    if (res.sync_step == null) {
-      ref = this.receive_handlers;
-      results = [];
-      for (i = 0, len = ref.length; i < len; i++) {
-        f = ref[i];
-        results.push(f(sender, res));
-      }
-      return results;
-    } else {
-      if (sender === this.user_id) {
-        return;
-      }
-      if (res.sync_step === "getHB") {
-        if (this.when_received_state_vector_listeners != null) {
-          ref1 = this.when_received_state_vector_listeners;
-          for (j = 0, len1 = ref1.length; j < len1; j++) {
-            f = ref1[j];
-            f.call(this, res.data);
-          }
-        }
-        delete this.when_received_state_vector_listeners;
-        data = this.getHB(res.data);
-        hb = data.hb;
-        _hb = [];
-        if (this.is_synced) {
-          sendApplyHB = (function(_this) {
-            return function(m) {
-              return _this.send(sender, m);
-            };
-          })(this);
-        } else {
-          sendApplyHB = (function(_this) {
-            return function(m) {
-              return _this.broadcast(m);
-            };
-          })(this);
-        }
-        for (k = 0, len2 = hb.length; k < len2; k++) {
-          o = hb[k];
-          _hb.push(o);
-          if (_hb.length > 10) {
-            sendApplyHB({
-              sync_step: "applyHB_",
-              data: _hb
-            });
-            _hb = [];
-          }
-        }
-        sendApplyHB({
-          sync_step: "applyHB",
-          data: _hb
-        });
-        if ((res.send_again != null) && this.perform_send_again) {
-          send_again = (function(_this) {
-            return function(sv) {
-              return function() {
-                var l, len3;
-                hb = _this.getHB(sv).hb;
-                for (l = 0, len3 = hb.length; l < len3; l++) {
-                  o = hb[l];
-                  _hb.push(o);
-                  if (_hb.length > 10) {
-                    _this.send(sender, {
-                      sync_step: "applyHB_",
-                      data: _hb
-                    });
-                    _hb = [];
-                  }
-                }
-                return _this.send(sender, {
-                  sync_step: "applyHB",
-                  data: _hb,
-                  sent_again: "true"
-                });
-              };
-            };
-          })(this)(data.state_vector);
-          return setTimeout(send_again, 3000);
-        }
-      } else if (res.sync_step === "applyHB") {
-        this.applyHB(res.data, sender === this.current_sync_target);
-        if ((this.syncMethod === "syncAll" || (res.sent_again != null)) && (!this.is_synced) && ((this.current_sync_target === sender) || (this.current_sync_target == null))) {
-          this.connections[sender].is_synced = true;
-          return this.findNewSyncTarget();
-        }
-      } else if (res.sync_step === "applyHB_") {
-        return this.applyHB(res.data, sender === this.current_sync_target);
-      }
-    }
-  },
-  parseMessageFromXml: function(m) {
-    var parse_array, parse_object;
-    parse_array = function(node) {
-      var i, len, n, ref, results;
-      ref = node.children;
-      results = [];
-      for (i = 0, len = ref.length; i < len; i++) {
-        n = ref[i];
-        if (n.getAttribute("isArray") === "true") {
-          results.push(parse_array(n));
-        } else {
-          results.push(parse_object(n));
-        }
-      }
-      return results;
-    };
-    parse_object = function(node) {
-      var i, int, json, len, n, name, ref, ref1, value;
-      json = {};
-      ref = node.attrs;
-      for (name in ref) {
-        value = ref[name];
-        int = parseInt(value);
-        if (isNaN(int) || ("" + int) !== value) {
-          json[name] = value;
-        } else {
-          json[name] = int;
-        }
-      }
-      ref1 = node.children;
-      for (i = 0, len = ref1.length; i < len; i++) {
-        n = ref1[i];
-        name = n.name;
-        if (n.getAttribute("isArray") === "true") {
-          json[name] = parse_array(n);
-        } else {
-          json[name] = parse_object(n);
-        }
-      }
-      return json;
-    };
-    return parse_object(m);
-  },
-  encodeMessageToXml: function(m, json) {
-    var encode_array, encode_object;
-    encode_object = function(m, json) {
-      var name, value;
-      for (name in json) {
-        value = json[name];
-        if (value == null) {
-
-        } else if (value.constructor === Object) {
-          encode_object(m.c(name), value);
-        } else if (value.constructor === Array) {
-          encode_array(m.c(name), value);
-        } else {
-          m.setAttribute(name, value);
-        }
-      }
-      return m;
-    };
-    encode_array = function(m, array) {
-      var e, i, len;
-      m.setAttribute("isArray", "true");
-      for (i = 0, len = array.length; i < len; i++) {
-        e = array[i];
-        if (e.constructor === Object) {
-          encode_object(m.c("array-element"), e);
-        } else {
-          encode_array(m.c("array-element"), e);
-        }
-      }
-      return m;
-    };
-    if (json.constructor === Object) {
-      return encode_object(m.c("y", {
-        xmlns: "http://y.ninja/connector-stanza"
-      }), json);
-    } else if (json.constructor === Array) {
-      return encode_array(m.c("y", {
-        xmlns: "http://y.ninja/connector-stanza"
-      }), json);
-    } else {
-      throw new Error("I can't encode this json!");
-    }
-  },
-  setIsBoundToY: function() {
-    if (typeof this.on_bound_to_y === "function") {
-      this.on_bound_to_y();
-    }
-    delete this.when_bound_to_y;
-    return this.is_bound_to_y = true;
-  }
-};
--- a/build/node/Engine.js
+++ b/build/node/Engine.js
@@ -1,120 +0,0 @@
-var Engine;
-
-if (typeof window !== "undefined" && window !== null) {
-  window.unprocessed_counter = 0;
-}
-
-if (typeof window !== "undefined" && window !== null) {
-  window.unprocessed_exec_counter = 0;
-}
-
-if (typeof window !== "undefined" && window !== null) {
-  window.unprocessed_types = [];
-}
-
-Engine = (function() {
-  function Engine(HB, types) {
-    this.HB = HB;
-    this.types = types;
-    this.unprocessed_ops = [];
-  }
-
-  Engine.prototype.parseOperation = function(json) {
-    var type;
-    type = this.types[json.type];
-    if ((type != null ? type.parse : void 0) != null) {
-      return type.parse(json);
-    } else {
-      throw new Error("You forgot to specify a parser for type " + json.type + ". The message is " + (JSON.stringify(json)) + ".");
-    }
-  };
-
-
-  /*
-  applyOpsBundle: (ops_json)->
-    ops = []
-    for o in ops_json
-      ops.push @parseOperation o
-    for o in ops
-      if not o.execute()
-        @unprocessed_ops.push o
-    @tryUnprocessed()
-   */
-
-  Engine.prototype.applyOpsCheckDouble = function(ops_json) {
-    var i, len, o, results;
-    results = [];
-    for (i = 0, len = ops_json.length; i < len; i++) {
-      o = ops_json[i];
-      if (this.HB.getOperation(o.uid) == null) {
-        results.push(this.applyOp(o));
-      } else {
-        results.push(void 0);
-      }
-    }
-    return results;
-  };
-
-  Engine.prototype.applyOps = function(ops_json) {
-    return this.applyOp(ops_json);
-  };
-
-  Engine.prototype.applyOp = function(op_json_array, fromHB) {
-    var i, len, o, op_json;
-    if (fromHB == null) {
-      fromHB = false;
-    }
-    if (op_json_array.constructor !== Array) {
-      op_json_array = [op_json_array];
-    }
-    for (i = 0, len = op_json_array.length; i < len; i++) {
-      op_json = op_json_array[i];
-      if (fromHB) {
-        op_json.fromHB = "true";
-      }
-      o = this.parseOperation(op_json);
-      o.parsed_from_json = op_json;
-      if (op_json.fromHB != null) {
-        o.fromHB = op_json.fromHB;
-      }
-      if (this.HB.getOperation(o) != null) {
-
-      } else if (((!this.HB.isExpectedOperation(o)) && (o.fromHB == null)) || (!o.execute())) {
-        this.unprocessed_ops.push(o);
-        if (typeof window !== "undefined" && window !== null) {
-          window.unprocessed_types.push(o.type);
-        }
-      }
-    }
-    return this.tryUnprocessed();
-  };
-
-  Engine.prototype.tryUnprocessed = function() {
-    var i, len, old_length, op, ref, unprocessed;
-    while (true) {
-      old_length = this.unprocessed_ops.length;
-      unprocessed = [];
-      ref = this.unprocessed_ops;
-      for (i = 0, len = ref.length; i < len; i++) {
-        op = ref[i];
-        if (this.HB.getOperation(op) != null) {
-
-        } else if ((!this.HB.isExpectedOperation(op) && (op.fromHB == null)) || (!op.execute())) {
-          unprocessed.push(op);
-        }
-      }
-      this.unprocessed_ops = unprocessed;
-      if (this.unprocessed_ops.length === old_length) {
-        break;
-      }
-    }
-    if (this.unprocessed_ops.length !== 0) {
-      return this.HB.invokeSync();
-    }
-  };
-
-  return Engine;
-
-})();
-
-module.exports = Engine;
--- a/build/node/HistoryBuffer.js
+++ b/build/node/HistoryBuffer.js
@@ -1,255 +0,0 @@
-var HistoryBuffer,
-  bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
-
-HistoryBuffer = (function() {
-  function HistoryBuffer(user_id1) {
-    this.user_id = user_id1;
-    this.emptyGarbage = bind(this.emptyGarbage, this);
-    this.operation_counter = {};
-    this.buffer = {};
-    this.change_listeners = [];
-    this.garbage = [];
-    this.trash = [];
-    this.performGarbageCollection = true;
-    this.garbageCollectTimeout = 30000;
-    this.reserved_identifier_counter = 0;
-    setTimeout(this.emptyGarbage, this.garbageCollectTimeout);
-  }
-
-  HistoryBuffer.prototype.setUserId = function(user_id1, state_vector) {
-    var base, buff, counter_diff, name, o, o_name, ref;
-    this.user_id = user_id1;
-    if ((base = this.buffer)[name = this.user_id] == null) {
-      base[name] = [];
-    }
-    buff = this.buffer[this.user_id];
-    counter_diff = state_vector[this.user_id] || 0;
-    if (this.buffer._temp != null) {
-      ref = this.buffer._temp;
-      for (o_name in ref) {
-        o = ref[o_name];
-        o.uid.creator = this.user_id;
-        o.uid.op_number += counter_diff;
-        buff[o.uid.op_number] = o;
-      }
-    }
-    this.operation_counter[this.user_id] = (this.operation_counter._temp || 0) + counter_diff;
-    delete this.operation_counter._temp;
-    return delete this.buffer._temp;
-  };
-
-  HistoryBuffer.prototype.emptyGarbage = function() {
-    var i, len, o, ref;
-    ref = this.garbage;
-    for (i = 0, len = ref.length; i < len; i++) {
-      o = ref[i];
-      if (typeof o.cleanup === "function") {
-        o.cleanup();
-      }
-    }
-    this.garbage = this.trash;
-    this.trash = [];
-    if (this.garbageCollectTimeout !== -1) {
-      this.garbageCollectTimeoutId = setTimeout(this.emptyGarbage, this.garbageCollectTimeout);
-    }
-    return void 0;
-  };
-
-  HistoryBuffer.prototype.getUserId = function() {
-    return this.user_id;
-  };
-
-  HistoryBuffer.prototype.addToGarbageCollector = function() {
-    var i, len, o, results;
-    if (this.performGarbageCollection) {
-      results = [];
-      for (i = 0, len = arguments.length; i < len; i++) {
-        o = arguments[i];
-        if (o != null) {
-          results.push(this.garbage.push(o));
-        } else {
-          results.push(void 0);
-        }
-      }
-      return results;
-    }
-  };
-
-  HistoryBuffer.prototype.stopGarbageCollection = function() {
-    this.performGarbageCollection = false;
-    this.setManualGarbageCollect();
-    this.garbage = [];
-    return this.trash = [];
-  };
-
-  HistoryBuffer.prototype.setManualGarbageCollect = function() {
-    this.garbageCollectTimeout = -1;
-    clearTimeout(this.garbageCollectTimeoutId);
-    return this.garbageCollectTimeoutId = void 0;
-  };
-
-  HistoryBuffer.prototype.setGarbageCollectTimeout = function(garbageCollectTimeout) {
-    this.garbageCollectTimeout = garbageCollectTimeout;
-  };
-
-  HistoryBuffer.prototype.getReservedUniqueIdentifier = function() {
-    return {
-      creator: '_',
-      op_number: "_" + (this.reserved_identifier_counter++)
-    };
-  };
-
-  HistoryBuffer.prototype.getOperationCounter = function(user_id) {
-    var ctn, ref, res, user;
-    if (user_id == null) {
-      res = {};
-      ref = this.operation_counter;
-      for (user in ref) {
-        ctn = ref[user];
-        res[user] = ctn;
-      }
-      return res;
-    } else {
-      return this.operation_counter[user_id];
-    }
-  };
-
-  HistoryBuffer.prototype.isExpectedOperation = function(o) {
-    var base, name;
-    if ((base = this.operation_counter)[name = o.uid.creator] == null) {
-      base[name] = 0;
-    }
-    o.uid.op_number <= this.operation_counter[o.uid.creator];
-    return true;
-  };
-
-  HistoryBuffer.prototype._encode = function(state_vector) {
-    var json, o, o_json, o_next, o_number, o_prev, ref, u_name, unknown, user;
-    if (state_vector == null) {
-      state_vector = {};
-    }
-    json = [];
-    unknown = function(user, o_number) {
-      if ((user == null) || (o_number == null)) {
-        throw new Error("dah!");
-      }
-      return (state_vector[user] == null) || state_vector[user] <= o_number;
-    };
-    ref = this.buffer;
-    for (u_name in ref) {
-      user = ref[u_name];
-      if (u_name === "_") {
-        continue;
-      }
-      for (o_number in user) {
-        o = user[o_number];
-        if ((o.uid.noOperation == null) && unknown(u_name, o_number)) {
-          o_json = o._encode();
-          if (o.next_cl != null) {
-            o_next = o.next_cl;
-            while ((o_next.next_cl != null) && unknown(o_next.uid.creator, o_next.uid.op_number)) {
-              o_next = o_next.next_cl;
-            }
-            o_json.next = o_next.getUid();
-          } else if (o.prev_cl != null) {
-            o_prev = o.prev_cl;
-            while ((o_prev.prev_cl != null) && unknown(o_prev.uid.creator, o_prev.uid.op_number)) {
-              o_prev = o_prev.prev_cl;
-            }
-            o_json.prev = o_prev.getUid();
-          }
-          json.push(o_json);
-        }
-      }
-    }
-    return json;
-  };
-
-  HistoryBuffer.prototype.getNextOperationIdentifier = function(user_id) {
-    var uid;
-    if (user_id == null) {
-      user_id = this.user_id;
-    }
-    if (this.operation_counter[user_id] == null) {
-      this.operation_counter[user_id] = 0;
-    }
-    uid = {
-      'creator': user_id,
-      'op_number': this.operation_counter[user_id]
-    };
-    this.operation_counter[user_id]++;
-    return uid;
-  };
-
-  HistoryBuffer.prototype.getOperation = function(uid) {
-    var o, ref;
-    if (uid.uid != null) {
-      uid = uid.uid;
-    }
-    o = (ref = this.buffer[uid.creator]) != null ? ref[uid.op_number] : void 0;
-    if ((uid.sub != null) && (o != null)) {
-      return o.retrieveSub(uid.sub);
-    } else {
-      return o;
-    }
-  };
-
-  HistoryBuffer.prototype.addOperation = function(o) {
-    if (this.buffer[o.uid.creator] == null) {
-      this.buffer[o.uid.creator] = {};
-    }
-    if (this.buffer[o.uid.creator][o.uid.op_number] != null) {
-      throw new Error("You must not overwrite operations!");
-    }
-    if ((o.uid.op_number.constructor !== String) && (!this.isExpectedOperation(o)) && (o.fromHB == null)) {
-      throw new Error("this operation was not expected!");
-    }
-    this.addToCounter(o);
-    this.buffer[o.uid.creator][o.uid.op_number] = o;
-    return o;
-  };
-
-  HistoryBuffer.prototype.removeOperation = function(o) {
-    var ref;
-    return (ref = this.buffer[o.uid.creator]) != null ? delete ref[o.uid.op_number] : void 0;
-  };
-
-  HistoryBuffer.prototype.setInvokeSyncHandler = function(f) {
-    return this.invokeSync = f;
-  };
-
-  HistoryBuffer.prototype.invokeSync = function() {};
-
-  HistoryBuffer.prototype.renewStateVector = function(state_vector) {
-    var results, state, user;
-    results = [];
-    for (user in state_vector) {
-      state = state_vector[user];
-      if (((this.operation_counter[user] == null) || (this.operation_counter[user] < state_vector[user])) && (state_vector[user] != null)) {
-        results.push(this.operation_counter[user] = state_vector[user]);
-      } else {
-        results.push(void 0);
-      }
-    }
-    return results;
-  };
-
-  HistoryBuffer.prototype.addToCounter = function(o) {
-    var base, name;
-    if ((base = this.operation_counter)[name = o.uid.creator] == null) {
-      base[name] = 0;
-    }
-    if (o.uid.op_number === this.operation_counter[o.uid.creator]) {
-      this.operation_counter[o.uid.creator]++;
-    }
-    while (this.buffer[o.uid.creator][this.operation_counter[o.uid.creator]] != null) {
-      this.operation_counter[o.uid.creator]++;
-    }
-    return void 0;
-  };
-
-  return HistoryBuffer;
-
-})();
-
-module.exports = HistoryBuffer;
--- a/build/node/ObjectType.js
+++ b/build/node/ObjectType.js
@@ -1,91 +0,0 @@
-var YObject;
-
-YObject = (function() {
-  function YObject(_object) {
-    var name, ref, val;
-    this._object = _object != null ? _object : {};
-    if (this._object.constructor === Object) {
-      ref = this._object;
-      for (name in ref) {
-        val = ref[name];
-        if (val.constructor === Object) {
-          this._object[name] = new YObject(val);
-        }
-      }
-    } else {
-      throw new Error("Y.Object accepts Json Objects only");
-    }
-  }
-
-  YObject.prototype._name = "Object";
-
-  YObject.prototype._getModel = function(types, ops) {
-    var n, o, ref;
-    if (this._model == null) {
-      this._model = new ops.MapManager(this).execute();
-      ref = this._object;
-      for (n in ref) {
-        o = ref[n];
-        this._model.val(n, o);
-      }
-    }
-    delete this._object;
-    return this._model;
-  };
-
-  YObject.prototype._setModel = function(_model) {
-    this._model = _model;
-    return delete this._object;
-  };
-
-  YObject.prototype.observe = function(f) {
-    this._model.observe(f);
-    return this;
-  };
-
-  YObject.prototype.unobserve = function(f) {
-    this._model.unobserve(f);
-    return this;
-  };
-
-  YObject.prototype.val = function(name, content) {
-    var n, ref, res, v;
-    if (this._model != null) {
-      return this._model.val.apply(this._model, arguments);
-    } else {
-      if (content != null) {
-        return this._object[name] = content;
-      } else if (name != null) {
-        return this._object[name];
-      } else {
-        res = {};
-        ref = this._object;
-        for (n in ref) {
-          v = ref[n];
-          res[n] = v;
-        }
-        return res;
-      }
-    }
-  };
-
-  YObject.prototype["delete"] = function(name) {
-    this._model["delete"](name);
-    return this;
-  };
-
-  return YObject;
-
-})();
-
-if (typeof window !== "undefined" && window !== null) {
-  if (window.Y != null) {
-    window.Y.Object = YObject;
-  } else {
-    throw new Error("You must first import Y!");
-  }
-}
-
-if (typeof module !== "undefined" && module !== null) {
-  module.exports = YObject;
-}
--- a/build/node/Operations/Basic.js
+++ b/build/node/Operations/Basic.js
@@ -1,670 +0,0 @@
-var slice = [].slice,
-  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-  hasProp = {}.hasOwnProperty;
-
-module.exports = function() {
-  var execution_listener, ops;
-  ops = {};
-  execution_listener = [];
-  ops.Operation = (function() {
-    function Operation(custom_type, uid, content, content_operations) {
-      var name, op;
-      if (custom_type != null) {
-        this.custom_type = custom_type;
-      }
-      this.is_deleted = false;
-      this.garbage_collected = false;
-      this.event_listeners = [];
-      if (uid != null) {
-        this.uid = uid;
-      }
-      if (content === void 0) {
-
-      } else if ((content != null) && (content.creator != null)) {
-        this.saveOperation('content', content);
-      } else {
-        this.content = content;
-      }
-      if (content_operations != null) {
-        this.content_operations = {};
-        for (name in content_operations) {
-          op = content_operations[name];
-          this.saveOperation(name, op, 'content_operations');
-        }
-      }
-    }
-
-    Operation.prototype.type = "Operation";
-
-    Operation.prototype.getContent = function(name) {
-      var content, n, ref, ref1, v;
-      if (this.content != null) {
-        if (this.content.getCustomType != null) {
-          return this.content.getCustomType();
-        } else if (this.content.constructor === Object) {
-          if (name != null) {
-            if (this.content[name] != null) {
-              return this.content[name];
-            } else {
-              return this.content_operations[name].getCustomType();
-            }
-          } else {
-            content = {};
-            ref = this.content;
-            for (n in ref) {
-              v = ref[n];
-              content[n] = v;
-            }
-            if (this.content_operations != null) {
-              ref1 = this.content_operations;
-              for (n in ref1) {
-                v = ref1[n];
-                v = v.getCustomType();
-                content[n] = v;
-              }
-            }
-            return content;
-          }
-        } else {
-          return this.content;
-        }
-      } else {
-        return this.content;
-      }
-    };
-
-    Operation.prototype.retrieveSub = function() {
-      throw new Error("sub properties are not enable on this operation type!");
-    };
-
-    Operation.prototype.observe = function(f) {
-      return this.event_listeners.push(f);
-    };
-
-    Operation.prototype.unobserve = function(f) {
-      return this.event_listeners = this.event_listeners.filter(function(g) {
-        return f !== g;
-      });
-    };
-
-    Operation.prototype.deleteAllObservers = function() {
-      return this.event_listeners = [];
-    };
-
-    Operation.prototype["delete"] = function() {
-      (new ops.Delete(void 0, this)).execute();
-      return null;
-    };
-
-    Operation.prototype.callEvent = function() {
-      var callon;
-      if (this.custom_type != null) {
-        callon = this.getCustomType();
-      } else {
-        callon = this;
-      }
-      return this.forwardEvent.apply(this, [callon].concat(slice.call(arguments)));
-    };
-
-    Operation.prototype.forwardEvent = function() {
-      var args, f, j, len, op, ref, results;
-      op = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-      ref = this.event_listeners;
-      results = [];
-      for (j = 0, len = ref.length; j < len; j++) {
-        f = ref[j];
-        results.push(f.call.apply(f, [op].concat(slice.call(args))));
-      }
-      return results;
-    };
-
-    Operation.prototype.isDeleted = function() {
-      return this.is_deleted;
-    };
-
-    Operation.prototype.applyDelete = function(garbagecollect) {
-      if (garbagecollect == null) {
-        garbagecollect = true;
-      }
-      if (!this.garbage_collected) {
-        this.is_deleted = true;
-        if (garbagecollect) {
-          this.garbage_collected = true;
-          return this.HB.addToGarbageCollector(this);
-        }
-      }
-    };
-
-    Operation.prototype.cleanup = function() {
-      this.HB.removeOperation(this);
-      return this.deleteAllObservers();
-    };
-
-    Operation.prototype.setParent = function(parent1) {
-      this.parent = parent1;
-    };
-
-    Operation.prototype.getParent = function() {
-      return this.parent;
-    };
-
-    Operation.prototype.getUid = function() {
-      var map_uid;
-      if (this.uid.noOperation == null) {
-        return this.uid;
-      } else {
-        if (this.uid.alt != null) {
-          map_uid = this.uid.alt.cloneUid();
-          map_uid.sub = this.uid.sub;
-          return map_uid;
-        } else {
-          return void 0;
-        }
-      }
-    };
-
-    Operation.prototype.cloneUid = function() {
-      var n, ref, uid, v;
-      uid = {};
-      ref = this.getUid();
-      for (n in ref) {
-        v = ref[n];
-        uid[n] = v;
-      }
-      return uid;
-    };
-
-    Operation.prototype.execute = function() {
-      var j, l, len;
-      if (this.validateSavedOperations()) {
-        this.is_executed = true;
-        if (this.uid == null) {
-          this.uid = this.HB.getNextOperationIdentifier();
-        }
-        if (this.uid.noOperation == null) {
-          this.HB.addOperation(this);
-          for (j = 0, len = execution_listener.length; j < len; j++) {
-            l = execution_listener[j];
-            l(this._encode());
-          }
-        }
-        return this;
-      } else {
-        return false;
-      }
-    };
-
-    Operation.prototype.saveOperation = function(name, op, base) {
-      var base1, dest, j, last_path, len, path, paths;
-      if (base == null) {
-        base = "this";
-      }
-      if ((op != null) && (op._getModel != null)) {
-        op = op._getModel(this.custom_types, this.operations);
-      }
-      if (op == null) {
-
-      } else if ((op.execute != null) || !((op.op_number != null) && (op.creator != null))) {
-        if (base === "this") {
-          return this[name] = op;
-        } else {
-          dest = this[base];
-          paths = name.split("/");
-          last_path = paths.pop();
-          for (j = 0, len = paths.length; j < len; j++) {
-            path = paths[j];
-            dest = dest[path];
-          }
-          return dest[last_path] = op;
-        }
-      } else {
-        if (this.unchecked == null) {
-          this.unchecked = {};
-        }
-        if ((base1 = this.unchecked)[base] == null) {
-          base1[base] = {};
-        }
-        return this.unchecked[base][name] = op;
-      }
-    };
-
-    Operation.prototype.validateSavedOperations = function() {
-      var base, base_name, dest, j, last_path, len, name, op, op_uid, path, paths, ref, success, uninstantiated;
-      uninstantiated = {};
-      success = true;
-      ref = this.unchecked;
-      for (base_name in ref) {
-        base = ref[base_name];
-        for (name in base) {
-          op_uid = base[name];
-          op = this.HB.getOperation(op_uid);
-          if (op) {
-            if (base_name === "this") {
-              this[name] = op;
-            } else {
-              dest = this[base_name];
-              paths = name.split("/");
-              last_path = paths.pop();
-              for (j = 0, len = paths.length; j < len; j++) {
-                path = paths[j];
-                dest = dest[path];
-              }
-              dest[last_path] = op;
-            }
-          } else {
-            if (uninstantiated[base_name] == null) {
-              uninstantiated[base_name] = {};
-            }
-            uninstantiated[base_name][name] = op_uid;
-            success = false;
-          }
-        }
-      }
-      if (!success) {
-        this.unchecked = uninstantiated;
-        return false;
-      } else {
-        delete this.unchecked;
-        return this;
-      }
-    };
-
-    Operation.prototype.getCustomType = function() {
-      var Type, j, len, ref, t;
-      if (this.custom_type == null) {
-        return this;
-      } else {
-        if (this.custom_type.constructor === String) {
-          Type = this.custom_types;
-          ref = this.custom_type.split(".");
-          for (j = 0, len = ref.length; j < len; j++) {
-            t = ref[j];
-            Type = Type[t];
-          }
-          this.custom_type = new Type();
-          this.custom_type._setModel(this);
-        }
-        return this.custom_type;
-      }
-    };
-
-    Operation.prototype._encode = function(json) {
-      var n, o, operations, ref, ref1;
-      if (json == null) {
-        json = {};
-      }
-      json.type = this.type;
-      json.uid = this.getUid();
-      if (this.custom_type != null) {
-        if (this.custom_type.constructor === String) {
-          json.custom_type = this.custom_type;
-        } else {
-          json.custom_type = this.custom_type._name;
-        }
-      }
-      if (((ref = this.content) != null ? ref.getUid : void 0) != null) {
-        json.content = this.content.getUid();
-      } else {
-        json.content = this.content;
-      }
-      if (this.content_operations != null) {
-        operations = {};
-        ref1 = this.content_operations;
-        for (n in ref1) {
-          o = ref1[n];
-          if (o._getModel != null) {
-            o = o._getModel(this.custom_types, this.operations);
-          }
-          operations[n] = o.getUid();
-        }
-        json.content_operations = operations;
-      }
-      return json;
-    };
-
-    return Operation;
-
-  })();
-  ops.Delete = (function(superClass) {
-    extend(Delete, superClass);
-
-    function Delete(custom_type, uid, deletes) {
-      this.saveOperation('deletes', deletes);
-      Delete.__super__.constructor.call(this, custom_type, uid);
-    }
-
-    Delete.prototype.type = "Delete";
-
-    Delete.prototype._encode = function() {
-      return {
-        'type': "Delete",
-        'uid': this.getUid(),
-        'deletes': this.deletes.getUid()
-      };
-    };
-
-    Delete.prototype.execute = function() {
-      var res;
-      if (this.validateSavedOperations()) {
-        res = Delete.__super__.execute.apply(this, arguments);
-        if (res) {
-          this.deletes.applyDelete(this);
-        }
-        return res;
-      } else {
-        return false;
-      }
-    };
-
-    return Delete;
-
-  })(ops.Operation);
-  ops.Delete.parse = function(o) {
-    var deletes_uid, uid;
-    uid = o['uid'], deletes_uid = o['deletes'];
-    return new this(null, uid, deletes_uid);
-  };
-  ops.Insert = (function(superClass) {
-    extend(Insert, superClass);
-
-    function Insert(custom_type, content, content_operations, parent, uid, prev_cl, next_cl, origin) {
-      this.saveOperation('parent', parent);
-      this.saveOperation('prev_cl', prev_cl);
-      this.saveOperation('next_cl', next_cl);
-      if (origin != null) {
-        this.saveOperation('origin', origin);
-      } else {
-        this.saveOperation('origin', prev_cl);
-      }
-      Insert.__super__.constructor.call(this, custom_type, uid, content, content_operations);
-    }
-
-    Insert.prototype.type = "Insert";
-
-    Insert.prototype.val = function() {
-      return this.getContent();
-    };
-
-    Insert.prototype.getNext = function(i) {
-      var n;
-      if (i == null) {
-        i = 1;
-      }
-      n = this;
-      while (i > 0 && (n.next_cl != null)) {
-        n = n.next_cl;
-        if (!n.is_deleted) {
-          i--;
-        }
-      }
-      if (n.is_deleted) {
-        null;
-      }
-      return n;
-    };
-
-    Insert.prototype.getPrev = function(i) {
-      var n;
-      if (i == null) {
-        i = 1;
-      }
-      n = this;
-      while (i > 0 && (n.prev_cl != null)) {
-        n = n.prev_cl;
-        if (!n.is_deleted) {
-          i--;
-        }
-      }
-      if (n.is_deleted) {
-        return null;
-      } else {
-        return n;
-      }
-    };
-
-    Insert.prototype.applyDelete = function(o) {
-      var callLater, garbagecollect;
-      if (this.deleted_by == null) {
-        this.deleted_by = [];
-      }
-      callLater = false;
-      if ((this.parent != null) && !this.is_deleted && (o != null)) {
-        callLater = true;
-      }
-      if (o != null) {
-        this.deleted_by.push(o);
-      }
-      garbagecollect = false;
-      if (this.next_cl.isDeleted()) {
-        garbagecollect = true;
-      }
-      Insert.__super__.applyDelete.call(this, garbagecollect);
-      if (callLater) {
-        this.parent.callOperationSpecificDeleteEvents(this, o);
-      }
-      if ((this.prev_cl != null) && this.prev_cl.isDeleted()) {
-        return this.prev_cl.applyDelete();
-      }
-    };
-
-    Insert.prototype.cleanup = function() {
-      var d, j, len, o, ref;
-      if (this.next_cl.isDeleted()) {
-        ref = this.deleted_by;
-        for (j = 0, len = ref.length; j < len; j++) {
-          d = ref[j];
-          d.cleanup();
-        }
-        o = this.next_cl;
-        while (o.type !== "Delimiter") {
-          if (o.origin === this) {
-            o.origin = this.prev_cl;
-          }
-          o = o.next_cl;
-        }
-        this.prev_cl.next_cl = this.next_cl;
-        this.next_cl.prev_cl = this.prev_cl;
-        if (this.content instanceof ops.Operation && !(this.content instanceof ops.Insert)) {
-          this.content.referenced_by--;
-          if (this.content.referenced_by <= 0 && !this.content.is_deleted) {
-            this.content.applyDelete();
-          }
-        }
-        delete this.content;
-        return Insert.__super__.cleanup.apply(this, arguments);
-      }
-    };
-
-    Insert.prototype.getDistanceToOrigin = function() {
-      var d, o;
-      d = 0;
-      o = this.prev_cl;
-      while (true) {
-        if (this.origin === o) {
-          break;
-        }
-        d++;
-        o = o.prev_cl;
-      }
-      return d;
-    };
-
-    Insert.prototype.execute = function() {
-      var base1, distance_to_origin, i, o;
-      if (!this.validateSavedOperations()) {
-        return false;
-      } else {
-        if (this.content instanceof ops.Operation) {
-          this.content.insert_parent = this;
-          if ((base1 = this.content).referenced_by == null) {
-            base1.referenced_by = 0;
-          }
-          this.content.referenced_by++;
-        }
-        if (this.parent != null) {
-          if (this.prev_cl == null) {
-            this.prev_cl = this.parent.beginning;
-          }
-          if (this.origin == null) {
-            this.origin = this.prev_cl;
-          } else if (this.origin === "Delimiter") {
-            this.origin = this.parent.beginning;
-          }
-          if (this.next_cl == null) {
-            this.next_cl = this.parent.end;
-          }
-        }
-        if (this.prev_cl != null) {
-          distance_to_origin = this.getDistanceToOrigin();
-          o = this.prev_cl.next_cl;
-          i = distance_to_origin;
-          while (true) {
-            if (o !== this.next_cl) {
-              if (o.getDistanceToOrigin() === i) {
-                if (o.uid.creator < this.uid.creator) {
-                  this.prev_cl = o;
-                  distance_to_origin = i + 1;
-                } else {
-
-                }
-              } else if (o.getDistanceToOrigin() < i) {
-                if (i - distance_to_origin <= o.getDistanceToOrigin()) {
-                  this.prev_cl = o;
-                  distance_to_origin = i + 1;
-                } else {
-
-                }
-              } else {
-                break;
-              }
-              i++;
-              o = o.next_cl;
-            } else {
-              break;
-            }
-          }
-          this.next_cl = this.prev_cl.next_cl;
-          this.prev_cl.next_cl = this;
-          this.next_cl.prev_cl = this;
-        }
-        this.setParent(this.prev_cl.getParent());
-        Insert.__super__.execute.apply(this, arguments);
-        this.parent.callOperationSpecificInsertEvents(this);
-        return this;
-      }
-    };
-
-    Insert.prototype.getPosition = function() {
-      var position, prev;
-      position = 0;
-      prev = this.prev_cl;
-      while (true) {
-        if (prev instanceof ops.Delimiter) {
-          break;
-        }
-        if (!prev.isDeleted()) {
-          position++;
-        }
-        prev = prev.prev_cl;
-      }
-      return position;
-    };
-
-    Insert.prototype._encode = function(json) {
-      if (json == null) {
-        json = {};
-      }
-      json.prev = this.prev_cl.getUid();
-      json.next = this.next_cl.getUid();
-      if (this.origin.type === "Delimiter") {
-        json.origin = "Delimiter";
-      } else if (this.origin !== this.prev_cl) {
-        json.origin = this.origin.getUid();
-      }
-      json.parent = this.parent.getUid();
-      return Insert.__super__._encode.call(this, json);
-    };
-
-    return Insert;
-
-  })(ops.Operation);
-  ops.Insert.parse = function(json) {
-    var content, content_operations, next, origin, parent, prev, uid;
-    content = json['content'], content_operations = json['content_operations'], uid = json['uid'], prev = json['prev'], next = json['next'], origin = json['origin'], parent = json['parent'];
-    return new this(null, content, content_operations, parent, uid, prev, next, origin);
-  };
-  ops.Delimiter = (function(superClass) {
-    extend(Delimiter, superClass);
-
-    function Delimiter(prev_cl, next_cl, origin) {
-      this.saveOperation('prev_cl', prev_cl);
-      this.saveOperation('next_cl', next_cl);
-      this.saveOperation('origin', prev_cl);
-      Delimiter.__super__.constructor.call(this, null, {
-        noOperation: true
-      });
-    }
-
-    Delimiter.prototype.type = "Delimiter";
-
-    Delimiter.prototype.applyDelete = function() {
-      var o;
-      Delimiter.__super__.applyDelete.call(this);
-      o = this.prev_cl;
-      while (o != null) {
-        o.applyDelete();
-        o = o.prev_cl;
-      }
-      return void 0;
-    };
-
-    Delimiter.prototype.cleanup = function() {
-      return Delimiter.__super__.cleanup.call(this);
-    };
-
-    Delimiter.prototype.execute = function() {
-      var ref, ref1;
-      if (((ref = this.unchecked) != null ? ref['next_cl'] : void 0) != null) {
-        return Delimiter.__super__.execute.apply(this, arguments);
-      } else if ((ref1 = this.unchecked) != null ? ref1['prev_cl'] : void 0) {
-        if (this.validateSavedOperations()) {
-          if (this.prev_cl.next_cl != null) {
-            throw new Error("Probably duplicated operations");
-          }
-          this.prev_cl.next_cl = this;
-          return Delimiter.__super__.execute.apply(this, arguments);
-        } else {
-          return false;
-        }
-      } else if ((this.prev_cl != null) && (this.prev_cl.next_cl == null)) {
-        delete this.prev_cl.unchecked.next_cl;
-        this.prev_cl.next_cl = this;
-        return Delimiter.__super__.execute.apply(this, arguments);
-      } else if ((this.prev_cl != null) || (this.next_cl != null) || true) {
-        return Delimiter.__super__.execute.apply(this, arguments);
-      }
-    };
-
-    Delimiter.prototype._encode = function() {
-      var ref, ref1;
-      return {
-        'type': this.type,
-        'uid': this.getUid(),
-        'prev': (ref = this.prev_cl) != null ? ref.getUid() : void 0,
-        'next': (ref1 = this.next_cl) != null ? ref1.getUid() : void 0
-      };
-    };
-
-    return Delimiter;
-
-  })(ops.Operation);
-  ops.Delimiter.parse = function(json) {
-    var next, prev, uid;
-    uid = json['uid'], prev = json['prev'], next = json['next'];
-    return new this(uid, prev, next);
-  };
-  return {
-    'operations': ops,
-    'execution_listener': execution_listener
-  };
-};
--- a/build/node/Operations/Structured.js
+++ b/build/node/Operations/Structured.js
@@ -1,579 +0,0 @@
-var basic_ops_uninitialized,
-  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-  hasProp = {}.hasOwnProperty;
-
-basic_ops_uninitialized = require("./Basic");
-
-module.exports = function() {
-  var basic_ops, ops;
-  basic_ops = basic_ops_uninitialized();
-  ops = basic_ops.operations;
-  ops.MapManager = (function(superClass) {
-    extend(MapManager, superClass);
-
-    function MapManager(custom_type, uid, content, content_operations) {
-      this._map = {};
-      MapManager.__super__.constructor.call(this, custom_type, uid, content, content_operations);
-    }
-
-    MapManager.prototype.type = "MapManager";
-
-    MapManager.prototype.applyDelete = function() {
-      var name, p, ref;
-      ref = this._map;
-      for (name in ref) {
-        p = ref[name];
-        p.applyDelete();
-      }
-      return MapManager.__super__.applyDelete.call(this);
-    };
-
-    MapManager.prototype.cleanup = function() {
-      return MapManager.__super__.cleanup.call(this);
-    };
-
-    MapManager.prototype.map = function(f) {
-      var n, ref, v;
-      ref = this._map;
-      for (n in ref) {
-        v = ref[n];
-        f(n, v);
-      }
-      return void 0;
-    };
-
-    MapManager.prototype.val = function(name, content) {
-      var o, prop, ref, rep, res, result;
-      if (arguments.length > 1) {
-        if ((content != null) && (content._getModel != null)) {
-          rep = content._getModel(this.custom_types, this.operations);
-        } else {
-          rep = content;
-        }
-        this.retrieveSub(name).replace(rep);
-        return this.getCustomType();
-      } else if (name != null) {
-        prop = this._map[name];
-        if ((prop != null) && !prop.isContentDeleted()) {
-          res = prop.val();
-          if (res instanceof ops.Operation) {
-            return res.getCustomType();
-          } else {
-            return res;
-          }
-        } else {
-          return void 0;
-        }
-      } else {
-        result = {};
-        ref = this._map;
-        for (name in ref) {
-          o = ref[name];
-          if (!o.isContentDeleted()) {
-            result[name] = o.val();
-          }
-        }
-        return result;
-      }
-    };
-
-    MapManager.prototype["delete"] = function(name) {
-      var ref;
-      if ((ref = this._map[name]) != null) {
-        ref.deleteContent();
-      }
-      return this;
-    };
-
-    MapManager.prototype.retrieveSub = function(property_name) {
-      var event_properties, event_this, rm, rm_uid;
-      if (this._map[property_name] == null) {
-        event_properties = {
-          name: property_name
-        };
-        event_this = this;
-        rm_uid = {
-          noOperation: true,
-          sub: property_name,
-          alt: this
-        };
-        rm = new ops.ReplaceManager(null, event_properties, event_this, rm_uid);
-        this._map[property_name] = rm;
-        rm.setParent(this, property_name);
-        rm.execute();
-      }
-      return this._map[property_name];
-    };
-
-    return MapManager;
-
-  })(ops.Operation);
-  ops.MapManager.parse = function(json) {
-    var content, content_operations, custom_type, uid;
-    uid = json['uid'], custom_type = json['custom_type'], content = json['content'], content_operations = json['content_operations'];
-    return new this(custom_type, uid, content, content_operations);
-  };
-  ops.ListManager = (function(superClass) {
-    extend(ListManager, superClass);
-
-    function ListManager(custom_type, uid, content, content_operations) {
-      this.beginning = new ops.Delimiter(void 0, void 0);
-      this.end = new ops.Delimiter(this.beginning, void 0);
-      this.beginning.next_cl = this.end;
-      this.beginning.execute();
-      this.end.execute();
-      ListManager.__super__.constructor.call(this, custom_type, uid, content, content_operations);
-    }
-
-    ListManager.prototype.type = "ListManager";
-
-    ListManager.prototype.applyDelete = function() {
-      var o;
-      o = this.beginning;
-      while (o != null) {
-        o.applyDelete();
-        o = o.next_cl;
-      }
-      return ListManager.__super__.applyDelete.call(this);
-    };
-
-    ListManager.prototype.cleanup = function() {
-      return ListManager.__super__.cleanup.call(this);
-    };
-
-    ListManager.prototype.toJson = function(transform_to_value) {
-      var i, j, len, o, results, val;
-      if (transform_to_value == null) {
-        transform_to_value = false;
-      }
-      val = this.val();
-      results = [];
-      for (o = j = 0, len = val.length; j < len; o = ++j) {
-        i = val[o];
-        if (o instanceof ops.Object) {
-          results.push(o.toJson(transform_to_value));
-        } else if (o instanceof ops.ListManager) {
-          results.push(o.toJson(transform_to_value));
-        } else if (transform_to_value && o instanceof ops.Operation) {
-          results.push(o.val());
-        } else {
-          results.push(o);
-        }
-      }
-      return results;
-    };
-
-    ListManager.prototype.execute = function() {
-      if (this.validateSavedOperations()) {
-        this.beginning.setParent(this);
-        this.end.setParent(this);
-        return ListManager.__super__.execute.apply(this, arguments);
-      } else {
-        return false;
-      }
-    };
-
-    ListManager.prototype.getLastOperation = function() {
-      return this.end.prev_cl;
-    };
-
-    ListManager.prototype.getFirstOperation = function() {
-      return this.beginning.next_cl;
-    };
-
-    ListManager.prototype.toArray = function() {
-      var o, result;
-      o = this.beginning.next_cl;
-      result = [];
-      while (o !== this.end) {
-        if (!o.is_deleted) {
-          result.push(o.val());
-        }
-        o = o.next_cl;
-      }
-      return result;
-    };
-
-    ListManager.prototype.map = function(f) {
-      var o, result;
-      o = this.beginning.next_cl;
-      result = [];
-      while (o !== this.end) {
-        if (!o.is_deleted) {
-          result.push(f(o));
-        }
-        o = o.next_cl;
-      }
-      return result;
-    };
-
-    ListManager.prototype.fold = function(init, f) {
-      var o;
-      o = this.beginning.next_cl;
-      while (o !== this.end) {
-        if (!o.is_deleted) {
-          init = f(init, o);
-        }
-        o = o.next_cl;
-      }
-      return init;
-    };
-
-    ListManager.prototype.val = function(pos) {
-      var o;
-      if (pos != null) {
-        o = this.getOperationByPosition(pos + 1);
-        if (!(o instanceof ops.Delimiter)) {
-          return o.val();
-        } else {
-          throw new Error("this position does not exist");
-        }
-      } else {
-        return this.toArray();
-      }
-    };
-
-    ListManager.prototype.ref = function(pos) {
-      var o;
-      if (pos != null) {
-        o = this.getOperationByPosition(pos + 1);
-        if (!(o instanceof ops.Delimiter)) {
-          return o;
-        } else {
-          return null;
-        }
-      } else {
-        throw new Error("you must specify a position parameter");
-      }
-    };
-
-    ListManager.prototype.getOperationByPosition = function(position) {
-      var o;
-      o = this.beginning;
-      while (true) {
-        if (o instanceof ops.Delimiter && (o.prev_cl != null)) {
-          o = o.prev_cl;
-          while (o.isDeleted() && (o.prev_cl != null)) {
-            o = o.prev_cl;
-          }
-          break;
-        }
-        if (position <= 0 && !o.isDeleted()) {
-          break;
-        }
-        o = o.next_cl;
-        if (!o.isDeleted()) {
-          position -= 1;
-        }
-      }
-      return o;
-    };
-
-    ListManager.prototype.push = function(content) {
-      return this.insertAfter(this.end.prev_cl, [content]);
-    };
-
-    ListManager.prototype.insertAfter = function(left, contents) {
-      var c, j, len, right, tmp;
-      right = left.next_cl;
-      while (right.isDeleted()) {
-        right = right.next_cl;
-      }
-      left = right.prev_cl;
-      if (contents instanceof ops.Operation) {
-        (new ops.Insert(null, content, null, void 0, void 0, left, right)).execute();
-      } else {
-        for (j = 0, len = contents.length; j < len; j++) {
-          c = contents[j];
-          if ((c != null) && (c._name != null) && (c._getModel != null)) {
-            c = c._getModel(this.custom_types, this.operations);
-          }
-          tmp = (new ops.Insert(null, c, null, void 0, void 0, left, right)).execute();
-          left = tmp;
-        }
-      }
-      return this;
-    };
-
-    ListManager.prototype.insert = function(position, contents) {
-      var ith;
-      ith = this.getOperationByPosition(position);
-      return this.insertAfter(ith, contents);
-    };
-
-    ListManager.prototype["delete"] = function(position, length) {
-      var d, delete_ops, i, j, o, ref;
-      if (length == null) {
-        length = 1;
-      }
-      o = this.getOperationByPosition(position + 1);
-      delete_ops = [];
-      for (i = j = 0, ref = length; 0 <= ref ? j < ref : j > ref; i = 0 <= ref ? ++j : --j) {
-        if (o instanceof ops.Delimiter) {
-          break;
-        }
-        d = (new ops.Delete(null, void 0, o)).execute();
-        o = o.next_cl;
-        while ((!(o instanceof ops.Delimiter)) && o.isDeleted()) {
-          o = o.next_cl;
-        }
-        delete_ops.push(d._encode());
-      }
-      return this;
-    };
-
-    ListManager.prototype.callOperationSpecificInsertEvents = function(op) {
-      var getContentType;
-      getContentType = function(content) {
-        if (content instanceof ops.Operation) {
-          return content.getCustomType();
-        } else {
-          return content;
-        }
-      };
-      return this.callEvent([
-        {
-          type: "insert",
-          reference: op,
-          position: op.getPosition(),
-          object: this.getCustomType(),
-          changedBy: op.uid.creator,
-          value: getContentType(op.val())
-        }
-      ]);
-    };
-
-    ListManager.prototype.callOperationSpecificDeleteEvents = function(op, del_op) {
-      return this.callEvent([
-        {
-          type: "delete",
-          reference: op,
-          position: op.getPosition(),
-          object: this.getCustomType(),
-          length: 1,
-          changedBy: del_op.uid.creator,
-          oldValue: op.val()
-        }
-      ]);
-    };
-
-    return ListManager;
-
-  })(ops.Operation);
-  ops.ListManager.parse = function(json) {
-    var content, content_operations, custom_type, uid;
-    uid = json['uid'], custom_type = json['custom_type'], content = json['content'], content_operations = json['content_operations'];
-    return new this(custom_type, uid, content, content_operations);
-  };
-  ops.Composition = (function(superClass) {
-    extend(Composition, superClass);
-
-    function Composition(custom_type, _composition_value, composition_value_operations, uid, tmp_composition_ref) {
-      var n, o;
-      this._composition_value = _composition_value;
-      Composition.__super__.constructor.call(this, custom_type, uid);
-      if (tmp_composition_ref != null) {
-        this.tmp_composition_ref = tmp_composition_ref;
-      } else {
-        this.composition_ref = this.end.prev_cl;
-      }
-      if (composition_value_operations != null) {
-        this.composition_value_operations = {};
-        for (n in composition_value_operations) {
-          o = composition_value_operations[n];
-          this.saveOperation(n, o, '_composition_value');
-        }
-      }
-    }
-
-    Composition.prototype.type = "Composition";
-
-    Composition.prototype.execute = function() {
-      var composition_ref;
-      if (this.validateSavedOperations()) {
-        this.getCustomType()._setCompositionValue(this._composition_value);
-        delete this._composition_value;
-        if (this.tmp_composition_ref) {
-          composition_ref = this.HB.getOperation(this.tmp_composition_ref);
-          if (composition_ref != null) {
-            delete this.tmp_composition_ref;
-            this.composition_ref = composition_ref;
-          }
-        }
-        return Composition.__super__.execute.apply(this, arguments);
-      } else {
-        return false;
-      }
-    };
-
-    Composition.prototype.callOperationSpecificInsertEvents = function(op) {
-      var o;
-      if (this.tmp_composition_ref != null) {
-        if (op.uid.creator === this.tmp_composition_ref.creator && op.uid.op_number === this.tmp_composition_ref.op_number) {
-          this.composition_ref = op;
-          delete this.tmp_composition_ref;
-          op = op.next_cl;
-          if (op === this.end) {
-            return;
-          }
-        } else {
-          return;
-        }
-      }
-      o = this.end.prev_cl;
-      while (o !== op) {
-        this.getCustomType()._unapply(o.undo_delta);
-        o = o.prev_cl;
-      }
-      while (o !== this.end) {
-        o.undo_delta = this.getCustomType()._apply(o.val());
-        o = o.next_cl;
-      }
-      this.composition_ref = this.end.prev_cl;
-      return this.callEvent([
-        {
-          type: "update",
-          changedBy: op.uid.creator,
-          newValue: this.val()
-        }
-      ]);
-    };
-
-    Composition.prototype.callOperationSpecificDeleteEvents = function(op, del_op) {};
-
-    Composition.prototype.applyDelta = function(delta, operations) {
-      (new ops.Insert(null, delta, operations, this, null, this.end.prev_cl, this.end)).execute();
-      return void 0;
-    };
-
-    Composition.prototype._encode = function(json) {
-      var custom, n, o, ref;
-      if (json == null) {
-        json = {};
-      }
-      custom = this.getCustomType()._getCompositionValue();
-      json.composition_value = custom.composition_value;
-      if (custom.composition_value_operations != null) {
-        json.composition_value_operations = {};
-        ref = custom.composition_value_operations;
-        for (n in ref) {
-          o = ref[n];
-          json.composition_value_operations[n] = o.getUid();
-        }
-      }
-      if (this.composition_ref != null) {
-        json.composition_ref = this.composition_ref.getUid();
-      } else {
-        json.composition_ref = this.tmp_composition_ref;
-      }
-      return Composition.__super__._encode.call(this, json);
-    };
-
-    return Composition;
-
-  })(ops.ListManager);
-  ops.Composition.parse = function(json) {
-    var composition_ref, composition_value, composition_value_operations, custom_type, uid;
-    uid = json['uid'], custom_type = json['custom_type'], composition_value = json['composition_value'], composition_value_operations = json['composition_value_operations'], composition_ref = json['composition_ref'];
-    return new this(custom_type, composition_value, composition_value_operations, uid, composition_ref);
-  };
-  ops.ReplaceManager = (function(superClass) {
-    extend(ReplaceManager, superClass);
-
-    function ReplaceManager(custom_type, event_properties1, event_this1, uid) {
-      this.event_properties = event_properties1;
-      this.event_this = event_this1;
-      if (this.event_properties['object'] == null) {
-        this.event_properties['object'] = this.event_this.getCustomType();
-      }
-      ReplaceManager.__super__.constructor.call(this, custom_type, uid);
-    }
-
-    ReplaceManager.prototype.type = "ReplaceManager";
-
-    ReplaceManager.prototype.callEventDecorator = function(events) {
-      var event, j, len, name, prop, ref;
-      if (!this.isDeleted()) {
-        for (j = 0, len = events.length; j < len; j++) {
-          event = events[j];
-          ref = this.event_properties;
-          for (name in ref) {
-            prop = ref[name];
-            event[name] = prop;
-          }
-        }
-        this.event_this.callEvent(events);
-      }
-      return void 0;
-    };
-
-    ReplaceManager.prototype.callOperationSpecificInsertEvents = function(op) {
-      var old_value;
-      if (op.next_cl.type === "Delimiter" && op.prev_cl.type !== "Delimiter") {
-        if (!op.is_deleted) {
-          old_value = op.prev_cl.val();
-          this.callEventDecorator([
-            {
-              type: "update",
-              changedBy: op.uid.creator,
-              oldValue: old_value
-            }
-          ]);
-        }
-        op.prev_cl.applyDelete();
-      } else if (op.next_cl.type !== "Delimiter") {
-        op.applyDelete();
-      } else {
-        this.callEventDecorator([
-          {
-            type: "add",
-            changedBy: op.uid.creator
-          }
-        ]);
-      }
-      return void 0;
-    };
-
-    ReplaceManager.prototype.callOperationSpecificDeleteEvents = function(op, del_op) {
-      if (op.next_cl.type === "Delimiter") {
-        return this.callEventDecorator([
-          {
-            type: "delete",
-            changedBy: del_op.uid.creator,
-            oldValue: op.val()
-          }
-        ]);
-      }
-    };
-
-    ReplaceManager.prototype.replace = function(content, replaceable_uid) {
-      var o, relp;
-      o = this.getLastOperation();
-      relp = (new ops.Insert(null, content, null, this, replaceable_uid, o, o.next_cl)).execute();
-      return void 0;
-    };
-
-    ReplaceManager.prototype.isContentDeleted = function() {
-      return this.getLastOperation().isDeleted();
-    };
-
-    ReplaceManager.prototype.deleteContent = function() {
-      var last_op;
-      last_op = this.getLastOperation();
-      if ((!last_op.isDeleted()) && last_op.type !== "Delimiter") {
-        (new ops.Delete(null, void 0, this.getLastOperation().uid)).execute();
-      }
-      return void 0;
-    };
-
-    ReplaceManager.prototype.val = function() {
-      var o;
-      o = this.getLastOperation();
-      return typeof o.val === "function" ? o.val() : void 0;
-    };
-
-    return ReplaceManager;
-
-  })(ops.ListManager);
-  return basic_ops;
-};
--- a/build/node/y-object.js
+++ b/build/node/y-object.js
@@ -1,90 +0,0 @@
-var bindToChildren;
-
-bindToChildren = function(that) {
-  var attr, i, j, ref;
-  for (i = j = 0, ref = that.children.length; 0 <= ref ? j < ref : j > ref; i = 0 <= ref ? ++j : --j) {
-    attr = that.children.item(i);
-    if (attr.name != null) {
-      attr.val = that.val.val(attr.name);
-    }
-  }
-  return that.val.observe(function(events) {
-    var event, k, len, newVal, results;
-    results = [];
-    for (k = 0, len = events.length; k < len; k++) {
-      event = events[k];
-      if (event.name != null) {
-        results.push((function() {
-          var l, ref1, results1;
-          results1 = [];
-          for (i = l = 0, ref1 = that.children.length; 0 <= ref1 ? l < ref1 : l > ref1; i = 0 <= ref1 ? ++l : --l) {
-            attr = that.children.item(i);
-            if ((attr.name != null) && attr.name === event.name) {
-              newVal = that.val.val(attr.name);
-              if (attr.val !== newVal) {
-                results1.push(attr.val = newVal);
-              } else {
-                results1.push(void 0);
-              }
-            } else {
-              results1.push(void 0);
-            }
-          }
-          return results1;
-        })());
-      } else {
-        results.push(void 0);
-      }
-    }
-    return results;
-  });
-};
-
-Polymer("y-object", {
-  ready: function() {
-    if (this.connector != null) {
-      this.val = new Y(this.connector);
-      return bindToChildren(this);
-    } else if (this.val != null) {
-      return bindToChildren(this);
-    }
-  },
-  valChanged: function() {
-    if ((this.val != null) && this.val._name === "Object") {
-      return bindToChildren(this);
-    }
-  },
-  connectorChanged: function() {
-    if (this.val == null) {
-      this.val = new Y(this.connector);
-      return bindToChildren(this);
-    }
-  }
-});
-
-Polymer("y-property", {
-  ready: function() {
-    if ((this.val != null) && (this.name != null)) {
-      if (this.val.constructor === Object) {
-        this.val = this.parentElement.val(this.name, new Y.Object(this.val)).val(this.name);
-      } else if (typeof this.val === "string") {
-        this.parentElement.val(this.name, this.val);
-      }
-      if (this.val._name === "Object") {
-        return bindToChildren(this);
-      }
-    }
-  },
-  valChanged: function() {
-    var ref;
-    if ((this.val != null) && (this.name != null)) {
-      if (this.val.constructor === Object) {
-        return this.val = this.parentElement.val.val(this.name, new Y.Object(this.val)).val(this.name);
-      } else if (this.val._name === "Object") {
-        return bindToChildren(this);
-      } else if ((((ref = this.parentElement.val) != null ? ref.val : void 0) != null) && this.val !== this.parentElement.val.val(this.name)) {
-        return this.parentElement.val.val(this.name, this.val);
-      }
-    }
-  }
-});
--- a/build/node/y.js
+++ b/build/node/y.js
@@ -1,45 +0,0 @@
-var Engine, HistoryBuffer, adaptConnector, createY, structured_ops_uninitialized;
-
-structured_ops_uninitialized = require("./Operations/Structured");
-
-HistoryBuffer = require("./HistoryBuffer");
-
-Engine = require("./Engine");
-
-adaptConnector = require("./ConnectorAdapter");
-
-createY = function(connector) {
-  var HB, ct, engine, model, ops, ops_manager, user_id;
-  if (connector.user_id != null) {
-    user_id = connector.user_id;
-  } else {
-    user_id = "_temp";
-    connector.when_received_state_vector_listeners = [
-      function(state_vector) {
-        return HB.setUserId(this.user_id, state_vector);
-      }
-    ];
-  }
-  HB = new HistoryBuffer(user_id);
-  ops_manager = structured_ops_uninitialized(HB, this.constructor);
-  ops = ops_manager.operations;
-  engine = new Engine(HB, ops);
-  adaptConnector(connector, engine, HB, ops_manager.execution_listener);
-  ops.Operation.prototype.HB = HB;
-  ops.Operation.prototype.operations = ops;
-  ops.Operation.prototype.engine = engine;
-  ops.Operation.prototype.connector = connector;
-  ops.Operation.prototype.custom_types = this.constructor;
-  ct = new createY.Object();
-  model = new ops.MapManager(ct, HB.getReservedUniqueIdentifier()).execute();
-  ct._setModel(model);
-  return ct;
-};
-
-module.exports = createY;
-
-if (typeof window !== "undefined" && window !== null) {
-  window.Y = createY;
-}
-
-createY.Object = require("./ObjectType");
--- a/build/test/index.html
+++ b/build/test/index.html
@@ -1,27 +0,0 @@
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test Yjs!</title>
-  <link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
-</head>
-<body>
-  <div id="mocha"></div>
-  <script src="../../node_modules/mocha/mocha.js" class="awesome"></script>
-  <script>
-    mocha.setup('bdd');
-    mocha.ui('bdd');
-    mocha.reporter('html');
-  </script>
-  <script src="object-test.js"></script>
-  <script src="xml-test.js"></script>
-  <script src="list-test.js"></script>
-  <script src="text-test.js"></script>
-  <script>
-    //mocha.checkLeaks();
-    //mocha.run();
-    window.onerror = null;
-    if (window.mochaPhantomJS) { mochaPhantomJS.run(); }
-    else { mocha.run(); }
-  </script>
-</body>
-</html>
--- a/build/test/list-test.js
+++ b/build/test/list-test.js
--- a/build/test/object-test.js
+++ b/build/test/object-test.js
--- a/build/test/richtext-test.js
+++ b/build/test/richtext-test.js
--- a/build/test/selections-test.js
+++ b/build/test/selections-test.js
--- a/build/test/text-test.js
+++ b/build/test/text-test.js
--- a/1
+++ b/1
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,5 +0,0 @@
-# Examples
-
-Here you find some (hopefully) usefull examples on how to use Yjs!
-
-Feel free to use the code of the examples in your own project. They include basic examples how to use Yjs.
--- a/examples/XMPP-Polymer/index.html
+++ b/examples/XMPP-Polymer/index.html
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <meta charset=utf-8 />
-    <title>Y Example</title>
-    <script src="../../../webcomponentsjs/webcomponents.min.js"></script>
-    <link rel="import" href="../../../polymer/polymer.html">
-
-    <link rel="import" href="y-test.html">
-  </head>
-  <body>
-    <y-test></y-test>
-  </body>
-</html>
--- a/examples/XMPP-Polymer/y-test.html
+++ b/examples/XMPP-Polymer/y-test.html
@@ -1,57 +0,0 @@
-<script src="../../build/browser/y.js"></script>
-<script src="../../../y-text/build/browser/y-text.js"></script>
-<link rel="import" href="../../build/browser/y-object.html">
-<link rel="import" href="../../../y-xmpp/build/browser/y-xmpp.html">
-<link rel="import" href="../../../paper-slider/paper-slider.html">
-
-<polymer-element name="y-test" attributes="y connector stuff">
-  <template>
-    <h1 id="text" contentEditable> Check this out !</h1>
-    <y-xmpp id="connector" connector={{connector}} room="testy-xmpp-polymer" syncMode="syncAll" debug="true"></y-xmpp>
-    <y-object connector={{connector}} val={{y}}>
-      <y-property name="slider" val={{slider}}>
-      </y-property>
-      <y-property name="stuff" val={{stuff}}>
-        <y-property id="otherstuff" name="otherstuff" val={{otherstuff}}>
-        </y-property>
-      </y-property>
-    </y-object>
-    <y-object val={{otherstuff}}>
-      <y-property name="nostuff" val={{nostuff}}>
-      </y-property>
-    </y-object>
-    <paper-slider min="0" max="200" immediateValue={{slider}}></paper-slider>
-  </template>
-  <script>
-  Polymer({
-    ready: function(){
-      window.y_stuff_property = this.$.otherstuff;
-      this.y.val("slider",50)
-      var that = this;
-      this.connector.whenSynced(function(){
-        if(that.y.val("text") == null){
-          that.y.val("text",new Y.Text("stuff"));
-        }
-        that.y.val("text").bind(that.$.text,that.shadowRoot)
-      })
-
-      // Everything is initialized. Lets test stuff!
-      window.y_test = this;
-      window.y_test.y.val("stuff",{otherstuff:{nostuff:"this is no stuff"}})
-      setTimeout(function(){
-        var res = y_test.y.val("stuff");
-        if(!(y_test.nostuff === "this is no stuff")){
-          console.log("Deep inherit doesn't work!")
-        }
-        window.y_stuff_property.val = {nostuff: "this is also no stuff"};
-        setTimeout(function(){
-          if(!(y_test.nostuff === "this is also no stuff")){
-            console.log("Element val overwrite doesn't work")
-          }
-          console.log("Everything is fine :)");
-        },500)
-      },500);
-    }
-  })
-  </script>
-</polymer-element>
--- a/examples/XMPP/index.html
+++ b/examples/XMPP/index.html
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-        <meta charset=utf-8 />
-        <title>Y Example</title>
-        <script src="../../build/browser/y.js"></script>
-        <script src="../../../y-text/build/browser/y-text.js"></script>
-        <script src="../../../y-xmpp/y-xmpp.js"></script>
-        <script src="./index.js"></script>
-</head>
-<body>
-<h1 contentEditable> yjs Tutorial</h1>
-<p> Collaborative Json editing with <a href="https://github.com/rwth-acis/yjs/">yjs</a>
-and XMPP Connector. </p>
-
-<textarea style="width:80%;" rows=40 id="textfield"></textarea>
-
-<p> <a href="https://github.com/y-js/yjs/">yjs</a> is a Framework for Real-Time collaboration on arbitrary data types.
-</p>
-</body>
-</html>
--- a/examples/XMPP/index.js
+++ b/examples/XMPP/index.js
@@ -1,26 +0,0 @@
-
-
-connector = new Y.XMPP().join("testy-xmpp-json3", {syncMode: "syncAll"});
-connector.debug = true
-
-y = new Y(connector);
-
-window.onload = function(){
-  var textbox = document.getElementById("textfield");
-  y.observe(function(events){
-    for(var i=0; i<events.length; i++){
-      var event = events[i];
-      if(event.name === "textfield" && event.type !== "delete"){
-        y.val("textfield").bind(textbox);
-        y.val("headline").bind(document.querySelector("h1"))
-      }
-    }
-  });
-  connector.whenSynced(function(){
-    if(y.val("textfield") == null){
-      y.val("headline", new Y.Text("headline"));
-      y.val("textfield",new Y.Text("stuff"))
-    }
-  })
-
-};
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -1,114 +0,0 @@
-gulp = require('gulp')
-coffee = require('gulp-coffee')
-concat = require('gulp-concat')
-uglify = require 'gulp-uglify'
-sourcemaps = require('gulp-sourcemaps')
-browserify = require('gulp-browserify')
-rename = require 'gulp-rename'
-rimraf = require 'gulp-rimraf'
-gulpif = require 'gulp-if'
-ignore = require 'gulp-ignore'
-git = require 'gulp-git'
-debug = require 'gulp-debug'
-coffeelint = require 'gulp-coffeelint'
-mocha = require 'gulp-mocha'
-run = require 'gulp-run'
-ljs = require 'gulp-ljs'
-plumber = require 'gulp-plumber'
-cache = require 'gulp-cached'
-coffeeify = require 'gulp-coffeeify'
-exit = require 'gulp-exit'
-
-gulp.task 'default', ['build_browser']
-
-files =
-  lib : ['./lib/**/*.coffee']
-  browser : ['./lib/y.coffee','./lib/y-object.coffee']
-  test : ['./test/**/*test.coffee', '../y-*/test/*test.coffee']
-  #test : ['./test/Json_test.coffee', './test/Text_test.coffee']
-  gulp : ['./gulpfile.coffee']
-  examples : ['./examples/**/*.js']
-  other: ['./lib/**/*', './test/*']
-
-files.all = []
-for name,file_list of files
-  if name isnt 'build'
-    files.all = files.all.concat file_list
-
-gulp.task 'deploy_nodejs', ->
-  gulp.src files.lib
-    .pipe sourcemaps.init()
-    .pipe coffee()
-    .pipe sourcemaps.write './'
-    .pipe gulp.dest 'build/node/'
-    .pipe gulpif '!**/', git.add({args : "-A"})
-
-gulp.task 'deploy', ['mocha', 'build_browser', 'deploy_nodejs', 'lint', 'codo']
-
-gulp.task 'build_browser', ->
-  gulp.src files.browser, { read: false }
-    .pipe plumber()
-    .pipe browserify
-      transform: ['coffeeify']
-      extensions: ['.coffee']
-      debug : true
-    .pipe rename
-      extname: ".js"
-    .pipe gulp.dest './build/browser/'
-    .pipe uglify()
-    .pipe gulp.dest '.'
-
-  gulp.src files.test, {read: false}
-    .pipe plumber()
-    .pipe browserify
-      transform: ['coffeeify']
-      extensions: ['.coffee']
-      debug: true
-    .pipe rename
-      extname: ".js"
-      dirname: "./"
-    .pipe gulp.dest './build/test/'
-
-gulp.task 'build_node', ->
-  gulp.src files.lib
-    .pipe plumber()
-    .pipe coffee({bare:true})
-    .pipe gulp.dest './build/node'
-
-gulp.task 'build', ['build_node', 'build_browser'], ->
-
-gulp.task 'watch', ['build'], ->
-  gulp.watch files.all, ['build']
-
-gulp.task 'mocha', ->
-  gulp.src files.test, { read: false }
-    .pipe mocha {reporter : 'list'}
-    .pipe exit()
-
-gulp.task 'lint', ->
-  gulp.src files.all
-    .pipe ignore.include '**/*.coffee'
-    .pipe coffeelint {
-      "max_line_length":
-        "level": "ignore"
-      }
-    .pipe coffeelint.reporter()
-
-gulp.task 'literate', ->
-  gulp.src files.examples
-    .pipe ljs { code : true }
-    .pipe rename
-      basename : "README"
-      extname : ".md"
-    .pipe gulp.dest 'examples/'
-    .pipe gulpif '!**/', git.add({args : "-A"})
-
-gulp.task 'codo', [], ()->
-  command = './node_modules/codo/bin/codo -o "./doc" --name "yjs" --readme "README.md" --undocumented false --private true --title "yjs API" ./lib - LICENSE.txt '
-  run(command).exec()
-
-gulp.task 'clean', ->
-  gulp.src ['./build/{browser,test,node}/**/*.{js,map}','./doc/'], { read: false }
-    .pipe rimraf()
-
-gulp.task 'default', ['clean','build'], ->
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -0,0 +1,207 @@
+/* eslint-env node */
+
+/** Gulp Commands
+
+  gulp command*
+    [--export ModuleType]
+    [--name ModuleName]
+    [--testport TestPort]
+    [--testfiles TestFiles]
+
+  Module name (ModuleName):
+    Compile this to "y.js" (default)
+
+  Supported module types (ModuleType):
+    - amd
+    - amdStrict
+    - common
+    - commonStrict
+    - ignore (default)
+    - system
+    - umd
+    - umdStrict
+
+  Test port (TestPort):
+    Serve the specs on port 8888 (default)
+
+  Test files (TestFiles):
+    Specify which specs to use!
+
+  Commands:
+    - build:deploy
+        Build this library for deployment (es6->es5, minified)
+    - dev:browser
+        Watch the ./src directory.
+        Builds the library on changes.
+        Starts an http-server and serves the test suite on http://127.0.0.1:8888.
+    - dev:node
+        Watch the ./src directory.
+        Builds and specs the library on changes.
+        Usefull to run with node-inspector.
+        `node-debug $(which gulp) dev:node
+    - test:
+        Test this library
+*/
+
+var gulp = require('gulp')
+var sourcemaps = require('gulp-sourcemaps')
+var babel = require('gulp-babel')
+var uglify = require('gulp-uglify')
+var minimist = require('minimist')
+var jasmine = require('gulp-jasmine')
+var jasmineBrowser = require('gulp-jasmine-browser')
+var concat = require('gulp-concat')
+var watch = require('gulp-watch')
+var shell = require('gulp-shell')
+var $ = require('gulp-load-plugins')()
+
+var options = minimist(process.argv.slice(2), {
+  string: ['export', 'name', 'testport', 'testfiles', 'regenerator'],
+  default: {
+    export: 'ignore',
+    name: 'y.js',
+    testport: '8888',
+    testfiles: 'src/**/*.js',
+    regenerator: process.version < 'v0.12'
+  }
+})
+
+var polyfills = [
+  './node_modules/gulp-babel/node_modules/babel-core/node_modules/regenerator/runtime.js'
+]
+
+var concatOrder = [
+  'y.js',
+  'Connector.js',
+  'Database.js',
+  'Transaction.js',
+  'Struct.js',
+  'Utils.js',
+  'Databases/RedBlackTree.js',
+  'Databases/Memory.js',
+  'Databases/IndexedDB.js',
+  'Connectors/Test.js',
+  'Connectors/WebRTC.js',
+  'Types/Array.js',
+  'Types/Map.js',
+  'Types/TextBind.js'
+]
+
+var files = {
+  src: polyfills.concat(concatOrder.map(function (f) {
+    return 'src/' + f
+  })),
+  test: ['build/Helper.spec.js'].concat(concatOrder.map(function (f) {
+    return 'build/' + f
+  }).concat(['build/**/*.spec.js']))
+}
+
+if (options.regenerator) {
+  files.test = polyfills.concat(files.test)
+}
+
+gulp.task('deploy:build', function () {
+  return gulp.src(files.src)
+    .pipe(sourcemaps.init())
+    .pipe(concat('y.js'))
+    .pipe(babel({
+      loose: 'all',
+      modules: 'ignore',
+      experimental: true
+    }))
+    .pipe(uglify())
+    .pipe(sourcemaps.write('.'))
+    .pipe(gulp.dest('.'))
+})
+
+gulp.task('deploy:updateSubmodule', function () {
+  return $.git.updateSubmodule({ args: '--init' })
+})
+
+gulp.task('deploy:copy', function () {
+  return gulp.src(['./y.js', './y.js.map', './README.md', 'package.json', 'LICENSE'])
+    .pipe(gulp.dest('./dist/'))
+})
+
+gulp.task('deploy:bump', function () {
+  return gulp.src('./package.json')
+    .pipe($.bump({type: 'patch'}))
+    .pipe(gulp.dest('./'))
+})
+
+gulp.task('deploy', ['deploy:updateSubmodule', 'deploy:bump', 'deploy:build', 'deploy:copy'], function () {
+  return gulp.src('./package.json', {read: false})
+    .pipe(shell([
+      'echo "Deploying version <%= getVersion(file.path) %>"',
+      'cd ./dist/',
+      'git add -A',
+      'git commit -am "Deploy <%= getVersion(file.path) %>" -n',
+      'git tag -a v<%= getVersion(file.path) %> -m "Release <%= getVersion(file.path) %>"',
+      'git push',
+      'git push origin --tags',
+      'cd ..',
+      'git commit -am "Release <%= getVersion(file.path) %>" -n',
+      'git push'
+    ], {
+      templateData: {
+        getVersion: function (s) {
+          return require(s).version
+        }
+      }
+    }))
+})
+
+gulp.task('build:test', function () {
+  var babelOptions = {
+    loose: 'all',
+    modules: 'ignore',
+    experimental: true
+  }
+  if (!options.regenerator) {
+    babelOptions.blacklist = 'regenerator'
+  }
+  gulp.src(files.src)
+    .pipe(sourcemaps.init())
+    .pipe(concat('y.js'))
+    .pipe(babel(babelOptions))
+    .pipe(sourcemaps.write())
+    .pipe(gulp.dest('.'))
+
+  return gulp.src('src/**/*.js')
+    .pipe(sourcemaps.init())
+    .pipe(babel(babelOptions))
+    .pipe(sourcemaps.write())
+    .pipe(gulp.dest('build'))
+})
+
+gulp.task('dev:node', ['test'], function () {
+  gulp.watch('src/**/*.js', ['test'])
+})
+
+gulp.task('dev:browser', ['build:test'], function () {
+  gulp.watch('src/**/*.js', ['build:test'])
+
+  gulp.src(files.test)
+    .pipe(watch(['build/**/*.js']))
+    .pipe(jasmineBrowser.specRunner())
+    .pipe(jasmineBrowser.server({port: options.testport}))
+})
+
+gulp.task('dev', ['build:test'], function () {
+  gulp.start('dev:browser')
+  gulp.start('dev:node')
+})
+
+gulp.task('test', ['build:test'], function () {
+  var testfiles = files.test
+  if (typeof Promise === 'undefined') {
+    testfiles.concat(['src/polyfills.js'])
+  }
+  return gulp.src(testfiles)
+    .pipe(jasmine({
+      verbose: true,
+      includeStuckTrace: true
+    }))
+})
+
+gulp.task('default', ['test'])
--- a/lib/ConnectorAdapter.coffee
+++ b/lib/ConnectorAdapter.coffee
@@ -1,61 +0,0 @@
-
-ConnectorClass = require "./ConnectorClass"
-#
-# @param {Engine} engine The transformation engine
-# @param {HistoryBuffer} HB
-# @param {Array<Function>} execution_listener You must ensure that whenever an operation is executed, every function in this Array is called.
-#
-adaptConnector = (connector, engine, HB, execution_listener)->
-
-  for name, f of ConnectorClass
-    connector[name] = f
-
-  connector.setIsBoundToY()
-
-  send_ = (o)->
-    if (o.uid.creator is HB.getUserId()) and
-        (typeof o.uid.op_number isnt "string") and # TODO: i don't think that we need this anymore..
-        (HB.getUserId() isnt "_temp")
-      connector.broadcast o
-
-  if connector.invokeSync?
-    HB.setInvokeSyncHandler connector.invokeSync
-
-  execution_listener.push send_
-  # For the XMPPConnector: lets send it as an array
-  # therefore, we have to restructure it later
-  encode_state_vector = (v)->
-    for name,value of v
-      user: name
-      state: value
-  parse_state_vector = (v)->
-    state_vector = {}
-    for s in v
-      state_vector[s.user] = s.state
-    state_vector
-
-  getStateVector = ()->
-    encode_state_vector HB.getOperationCounter()
-
-  getHB = (v)->
-    state_vector = parse_state_vector v
-    hb = HB._encode state_vector
-    json =
-      hb: hb
-      state_vector: encode_state_vector HB.getOperationCounter()
-    json
-
-  applyHB = (hb, fromHB)->
-    engine.applyOp hb, fromHB
-
-  connector.getStateVector = getStateVector
-  connector.getHB = getHB
-  connector.applyHB = applyHB
-
-  connector.receive_handlers ?= []
-  connector.receive_handlers.push (sender, op)->
-    if op.uid.creator isnt HB.getUserId()
-      engine.applyOp op
-
-
-module.exports = adaptConnector
--- a/lib/ConnectorClass.coffee
+++ b/lib/ConnectorClass.coffee
@@ -1,355 +0,0 @@
-
-module.exports =
-  #
-  # @params new Connector(options)
-  #   @param options.syncMethod {String}  is either "syncAll" or "master-slave".
-  #   @param options.role {String} The role of this client
-  #            (slave or master (only used when syncMethod is master-slave))
-  #   @param options.perform_send_again {Boolean} Whetehr to whether to resend the HB after some time period. This reduces sync errors, but has some overhead (optional)
-  #
-  init: (options)->
-    req = (name, choices)=>
-      if options[name]?
-        if (not choices?) or choices.some((c)->c is options[name])
-          @[name] = options[name]
-        else
-          throw new Error "You can set the '"+name+"' option to one of the following choices: "+JSON.encode(choices)
-      else
-        throw new Error "You must specify "+name+", when initializing the Connector!"
-
-    req "syncMethod", ["syncAll", "master-slave"]
-    req "role", ["master", "slave"]
-    req "user_id"
-    @on_user_id_set?(@user_id)
-
-    # whether to resend the HB after some time period. This reduces sync errors.
-    # But this is not necessary in the test-connector
-    if options.perform_send_again?
-      @perform_send_again = options.perform_send_again
-    else
-      @perform_send_again = true
-
-    # A Master should sync with everyone! TODO: really? - for now its safer this way!
-    if @role is "master"
-      @syncMethod = "syncAll"
-
-    # is set to true when this is synced with all other connections
-    @is_synced = false
-    # Peerjs Connections: key: conn-id, value: object
-    @connections = {}
-    # List of functions that shall process incoming data
-    @receive_handlers ?= []
-
-    # whether this instance is bound to any y instance
-    @connections = {}
-    @current_sync_target = null
-    @sent_hb_to_all_users = false
-    @is_initialized = true
-
-  onUserEvent: (f)->
-    @connections_listeners ?= []
-    @connections_listeners.push f
-
-  isRoleMaster: ->
-    @role is "master"
-
-  isRoleSlave: ->
-    @role is "slave"
-
-  findNewSyncTarget: ()->
-    @current_sync_target = null
-    if @syncMethod is "syncAll"
-      for user, c of @connections
-        if not c.is_synced
-          @performSync user
-          break
-    if not @current_sync_target?
-      @setStateSynced()
-    null
-
-  userLeft: (user)->
-    delete @connections[user]
-    @findNewSyncTarget()
-    if @connections_listeners?
-      for f in @connections_listeners
-        f {
-          action: "userLeft"
-          user: user
-        }
-
-
-  userJoined: (user, role)->
-    if not role?
-      throw new Error "Internal: You must specify the role of the joined user! E.g. userJoined('uid:3939','slave')"
-    # a user joined the room
-    @connections[user] ?= {}
-    @connections[user].is_synced = false
-
-    if (not @is_synced) or @syncMethod is "syncAll"
-      if @syncMethod is "syncAll"
-        @performSync user
-      else if role is "master"
-        # TODO: What if there are two masters? Prevent sending everything two times!
-        @performSyncWithMaster user
-
-    if @connections_listeners?
-      for f in @connections_listeners
-        f {
-          action: "userJoined"
-          user: user
-          role: role
-        }
-
-  #
-  # Execute a function _when_ we are connected. If not connected, wait until connected.
-  # @param f {Function} Will be executed on the Connector context.
-  #
-  whenSynced: (args)->
-    if args.constructor is Function
-      args = [args]
-    if @is_synced
-      args[0].apply this, args[1..]
-    else
-      @compute_when_synced ?= []
-      @compute_when_synced.push args
-
-  #
-  # Execute an function when a message is received.
-  # @param f {Function} Will be executed on the PeerJs-Connector context. f will be called with (sender_id, broadcast {true|false}, message).
-  #
-  onReceive: (f)->
-    @receive_handlers.push f
-
-  ###
-  # Broadcast a message to all connected peers.
-  # @param message {Object} The message to broadcast.
-  #
-  broadcast: (message)->
-    throw new Error "You must implement broadcast!"
-
-  #
-  # Send a message to a peer, or set of peers
-  #
-  send: (peer_s, message)->
-    throw new Error "You must implement send!"
-  ###
-
-  #
-  # perform a sync with a specific user.
-  #
-  performSync: (user)->
-    if not @current_sync_target?
-      @current_sync_target = user
-      @send user,
-        sync_step: "getHB"
-        send_again: "true"
-        data: @getStateVector()
-      if not @sent_hb_to_all_users
-        @sent_hb_to_all_users = true
-
-        hb = @getHB([]).hb
-        _hb = []
-        for o in hb
-          _hb.push o
-          if _hb.length > 10
-            @broadcast
-              sync_step: "applyHB_"
-              data: _hb
-            _hb = []
-        @broadcast
-          sync_step: "applyHB"
-          data: _hb
-
-
-
-  #
-  # When a master node joined the room, perform this sync with him. It will ask the master for the HB,
-  # and will broadcast his own HB
-  #
-  performSyncWithMaster: (user)->
-    @current_sync_target = user
-    @send user,
-      sync_step: "getHB"
-      send_again: "true"
-      data: @getStateVector()
-    hb = @getHB([]).hb
-    _hb = []
-    for o in hb
-      _hb.push o
-      if _hb.length > 10
-        @broadcast
-          sync_step: "applyHB_"
-          data: _hb
-        _hb = []
-    @broadcast
-      sync_step: "applyHB"
-      data: _hb
-
-  #
-  # You are sure that all clients are synced, call this function.
-  #
-  setStateSynced: ()->
-    if not @is_synced
-      @is_synced = true
-      if @compute_when_synced?
-        for el in @compute_when_synced
-          f = el[0]
-          args = el[1..]
-          f.apply(args)
-        delete @compute_when_synced
-      null
-
-  # executed when the a state_vector is received. listener will be called only once!
-  whenReceivedStateVector: (f)->
-    @when_received_state_vector_listeners ?= []
-    @when_received_state_vector_listeners.push f
-
-
-  #
-  # You received a raw message, and you know that it is intended for to Yjs. Then call this function.
-  #
-  receiveMessage: (sender, res)->
-    if not res.sync_step?
-      for f in @receive_handlers
-        f sender, res
-    else
-      if sender is @user_id
-        return
-      if res.sync_step is "getHB"
-        # call listeners
-        if @when_received_state_vector_listeners?
-          for f in @when_received_state_vector_listeners
-            f.call this, res.data
-        delete @when_received_state_vector_listeners
-
-        data = @getHB(res.data)
-        hb = data.hb
-        _hb = []
-        # always broadcast, when not synced.
-        # This reduces errors, when the clients goes offline prematurely.
-        # When this client only syncs to one other clients, but looses connectors,
-        # before syncing to the other clients, the online clients have different states.
-        # Since we do not want to perform regular syncs, this is a good alternative
-        if @is_synced
-          sendApplyHB = (m)=>
-            @send sender, m
-        else
-          sendApplyHB = (m)=>
-            @broadcast m
-
-        for o in hb
-          _hb.push o
-          if _hb.length > 10
-            sendApplyHB
-              sync_step: "applyHB_"
-              data: _hb
-            _hb = []
-
-        sendApplyHB
-          sync_step : "applyHB"
-          data: _hb
-
-        if res.send_again? and @perform_send_again
-          send_again = do (sv = data.state_vector)=>
-            ()=>
-              hb = @getHB(sv).hb
-              for o in hb
-                _hb.push o
-                if _hb.length > 10
-                  @send sender,
-                    sync_step: "applyHB_"
-                    data: _hb
-                  _hb = []
-              @send sender,
-                sync_step: "applyHB",
-                data: _hb
-                sent_again: "true"
-          setTimeout send_again, 3000
-      else if res.sync_step is "applyHB"
-        @applyHB(res.data, sender is @current_sync_target)
-
-        if (@syncMethod is "syncAll" or res.sent_again?) and (not @is_synced) and ((@current_sync_target is sender) or (not @current_sync_target?))
-          @connections[sender].is_synced = true
-          @findNewSyncTarget()
-
-      else if res.sync_step is "applyHB_"
-        @applyHB(res.data, sender is @current_sync_target)
-
-
-  # Currently, the HB encodes operations as JSON. For the moment I want to keep it
-  # that way. Maybe we support encoding in the HB as XML in the future, but for now I don't want
-  # too much overhead. Y is very likely to get changed a lot in the future
-  #
-  # Because we don't want to encode JSON as string (with character escaping, wich makes it pretty much unreadable)
-  # we encode the JSON as XML.
-  #
-  # When the HB support encoding as XML, the format should look pretty much like this.
-
-  # does not support primitive values as array elements
-  # expects an ltx (less than xml) object
-  parseMessageFromXml: (m)->
-    parse_array = (node)->
-      for n in node.children
-        if n.getAttribute("isArray") is "true"
-          parse_array n
-        else
-          parse_object n
-
-    parse_object = (node)->
-      json = {}
-      for name, value  of node.attrs
-        int = parseInt(value)
-        if isNaN(int) or (""+int) isnt value
-          json[name] = value
-        else
-          json[name] = int
-      for n in node.children
-        name = n.name
-        if n.getAttribute("isArray") is "true"
-          json[name] = parse_array n
-        else
-          json[name] = parse_object n
-      json
-    parse_object m
-
-  # encode message in xml
-  # we use string because Strophe only accepts an "xml-string"..
-  # So {a:4,b:{c:5}} will look like
-  # <y a="4">
-  #   <b c="5"></b>
-  # </y>
-  # m - ltx element
-  # json - guess it ;)
-  #
-  encodeMessageToXml: (m, json)->
-    # attributes is optional
-    encode_object = (m, json)->
-      for name,value of json
-        if not value?
-          # nop
-        else if value.constructor is Object
-          encode_object m.c(name), value
-        else if value.constructor is Array
-          encode_array m.c(name), value
-        else
-          m.setAttribute(name,value)
-      m
-    encode_array = (m, array)->
-      m.setAttribute("isArray","true")
-      for e in array
-        if e.constructor is Object
-          encode_object m.c("array-element"), e
-        else
-          encode_array m.c("array-element"), e
-      m
-    if json.constructor is Object
-      encode_object m.c("y",{xmlns:"http://y.ninja/connector-stanza"}), json
-    else if json.constructor is Array
-      encode_array m.c("y",{xmlns:"http://y.ninja/connector-stanza"}), json
-    else
-      throw new Error "I can't encode this json!"
-
-  setIsBoundToY: ()->
-    @on_bound_to_y?()
-    delete @when_bound_to_y
-    @is_bound_to_y = true
--- a/lib/Engine.coffee
+++ b/lib/Engine.coffee
@@ -1,115 +0,0 @@
-
-window?.unprocessed_counter = 0 # del this
-window?.unprocessed_exec_counter = 0 # TODO
-window?.unprocessed_types = []
-
-#
-# @nodoc
-# The Engine handles how and in which order to execute operations and add operations to the HistoryBuffer.
-#
-class Engine
-
-  #
-  # @param {HistoryBuffer} HB
-  # @param {Object} types list of available types
-  #
-  constructor: (@HB, @types)->
-    @unprocessed_ops = []
-
-  #
-  # Parses an operatio from the json format. It uses the specified parser in your OperationType module.
-  #
-  parseOperation: (json)->
-    type = @types[json.type]
-    if type?.parse?
-      type.parse json
-    else
-      throw new Error "You forgot to specify a parser for type #{json.type}. The message is #{JSON.stringify json}."
-
-
-  #
-  # Apply a set of operations. E.g. the operations you received from another users HB._encode().
-  # @note You must not use this method when you already have ops in your HB!
-  ###
-  applyOpsBundle: (ops_json)->
-    ops = []
-    for o in ops_json
-      ops.push @parseOperation o
-    for o in ops
-      if not o.execute()
-        @unprocessed_ops.push o
-    @tryUnprocessed()
-  ###
-
-  #
-  # Same as applyOps but operations that are already in the HB are not applied.
-  # @see Engine.applyOps
-  #
-  applyOpsCheckDouble: (ops_json)->
-    for o in ops_json
-      if not @HB.getOperation(o.uid)?
-        @applyOp o
-
-  #
-  # Apply a set of operations. (Helper for using applyOp on Arrays)
-  # @see Engine.applyOp
-  applyOps: (ops_json)->
-    @applyOp ops_json
-
-  #
-  # Apply an operation that you received from another peer.
-  # TODO: make this more efficient!!
-  # - operations may only executed in order by creator, order them in object of arrays (key by creator)
-  # - you can probably make something like dependencies (creator1 waits for creator2)
-  applyOp: (op_json_array, fromHB = false)->
-    if op_json_array.constructor isnt Array
-      op_json_array = [op_json_array]
-    for op_json in op_json_array
-      if fromHB
-        op_json.fromHB = "true" # execute immediately, if
-      # $parse_and_execute will return false if $o_json was parsed and executed, otherwise the parsed operadion
-      o = @parseOperation op_json
-      o.parsed_from_json = op_json
-      if op_json.fromHB?
-        o.fromHB = op_json.fromHB
-      # @HB.addOperation o
-      if @HB.getOperation(o)?
-        # nop
-      else if ((not @HB.isExpectedOperation(o)) and (not o.fromHB?)) or (not o.execute())
-        @unprocessed_ops.push o
-        window?.unprocessed_types.push o.type # TODO: delete this
-    @tryUnprocessed()
-
-  #
-  # Call this method when you applied a new operation.
-  # It checks if operations that were previously not executable are now executable.
-  #
-  tryUnprocessed: ()->
-    while true
-      old_length = @unprocessed_ops.length
-      unprocessed = []
-      for op in @unprocessed_ops
-        if @HB.getOperation(op)?
-          # nop
-        else if (not @HB.isExpectedOperation(op) and (not op.fromHB?)) or (not op.execute())
-          unprocessed.push op
-      @unprocessed_ops = unprocessed
-      if @unprocessed_ops.length is old_length
-        break
-    if @unprocessed_ops.length isnt 0
-      @HB.invokeSync()
-
-
-module.exports = Engine
-
-
-
-
-
-
-
-
-
-
-
-
--- a/lib/HistoryBuffer.coffee
+++ b/lib/HistoryBuffer.coffee
@@ -1,227 +0,0 @@
-
-#
-# @nodoc
-# An object that holds all applied operations.
-#
-# @note The HistoryBuffer is commonly abbreviated to HB.
-#
-class HistoryBuffer
-
-  #
-  # Creates an empty HB.
-  # @param {Object} user_id Creator of the HB.
-  #
-  constructor: (@user_id)->
-    @operation_counter = {}
-    @buffer = {}
-    @change_listeners = []
-    @garbage = [] # Will be cleaned on next call of garbageCollector
-    @trash = [] # Is deleted. Wait until it is not used anymore.
-    @performGarbageCollection = true
-    @garbageCollectTimeout = 30000
-    @reserved_identifier_counter = 0
-    setTimeout @emptyGarbage, @garbageCollectTimeout
-
-  # At the beginning (when the user id was not assigned yet),
-  # the operations are added to buffer._temp. When you finally get your user id,
-  # the operations are copies from buffer._temp to buffer[id]. Furthermore, when buffer[id] does already contain operations
-  # (because of a previous session), the uid.op_numbers of the operations have to be reassigned.
-  # This is what this function does. It adds them to buffer[id],
-  # and assigns them the correct uid.op_number and uid.creator
-  setUserId: (@user_id, state_vector)->
-    @buffer[@user_id] ?= []
-    buff = @buffer[@user_id]
-
-    # we assumed that we started with counter = 0.
-    # when we receive tha state_vector, and actually have
-    # counter = 10. Then we have to add 10 to every op_counter
-    counter_diff = state_vector[@user_id] or 0
-
-    if @buffer._temp?
-      for o_name,o of @buffer._temp
-        o.uid.creator = @user_id
-        o.uid.op_number += counter_diff
-        buff[o.uid.op_number] = o
-
-    @operation_counter[@user_id] = (@operation_counter._temp or 0) + counter_diff
-
-    delete @operation_counter._temp
-    delete @buffer._temp
-
-
-  emptyGarbage: ()=>
-    for o in @garbage
-      #if @getOperationCounter(o.uid.creator) > o.uid.op_number
-      o.cleanup?()
-
-    @garbage = @trash
-    @trash = []
-    if @garbageCollectTimeout isnt -1
-      @garbageCollectTimeoutId = setTimeout @emptyGarbage, @garbageCollectTimeout
-    undefined
-
-  #
-  # Get the user id with wich the History Buffer was initialized.
-  #
-  getUserId: ()->
-    @user_id
-
-  addToGarbageCollector: ()->
-    if @performGarbageCollection
-      for o in arguments
-        if o?
-          @garbage.push o
-
-  stopGarbageCollection: ()->
-    @performGarbageCollection = false
-    @setManualGarbageCollect()
-    @garbage = []
-    @trash = []
-
-  setManualGarbageCollect: ()->
-    @garbageCollectTimeout = -1
-    clearTimeout @garbageCollectTimeoutId
-    @garbageCollectTimeoutId = undefined
-
-  setGarbageCollectTimeout: (@garbageCollectTimeout)->
-
-  #
-  # I propose to use it in your Framework, to create something like a root element.
-  # An operation with this identifier is not propagated to other clients.
-  # This is why everybode must create the same operation with this uid.
-  #
-  getReservedUniqueIdentifier: ()->
-    {
-      creator : '_'
-      op_number : "_#{@reserved_identifier_counter++}"
-    }
-
-  #
-  # Get the operation counter that describes the current state of the document.
-  #
-  getOperationCounter: (user_id)->
-    if not user_id?
-      res = {}
-      for user,ctn of @operation_counter
-        res[user] = ctn
-      res
-    else
-      @operation_counter[user_id]
-
-  isExpectedOperation: (o)->
-    @operation_counter[o.uid.creator] ?= 0
-    o.uid.op_number <= @operation_counter[o.uid.creator]
-    true #TODO: !! this could break stuff. But I dunno why
-
-  #
-  # Encode this operation in such a way that it can be parsed by remote peers.
-  # TODO: Make this more efficient!
-  _encode: (state_vector={})->
-    json = []
-    unknown = (user, o_number)->
-      if (not user?) or (not o_number?)
-        throw new Error "dah!"
-      not state_vector[user]? or state_vector[user] <= o_number
-
-    for u_name,user of @buffer
-      # TODO next, if @state_vector[user] <= state_vector[user]
-      if u_name is "_"
-        continue
-      for o_number,o of user
-        if (not o.uid.noOperation?) and unknown(u_name, o_number)
-          # its necessary to send it, and not known in state_vector
-          o_json = o._encode()
-          if o.next_cl? # applies for all ops but the most right delimiter!
-            # search for the next _known_ operation. (When state_vector is {} then this is the Delimiter)
-            o_next = o.next_cl
-            while o_next.next_cl? and unknown(o_next.uid.creator, o_next.uid.op_number)
-              o_next = o_next.next_cl
-            o_json.next = o_next.getUid()
-          else if o.prev_cl? # most right delimiter only!
-            # same as the above with prev.
-            o_prev = o.prev_cl
-            while o_prev.prev_cl? and unknown(o_prev.uid.creator, o_prev.uid.op_number)
-              o_prev = o_prev.prev_cl
-            o_json.prev = o_prev.getUid()
-          json.push o_json
-
-    json
-
-  #
-  # Get the number of operations that were created by a user.
-  # Accordingly you will get the next operation number that is expected from that user.
-  # This will increment the operation counter.
-  #
-  getNextOperationIdentifier: (user_id)->
-    if not user_id?
-      user_id = @user_id
-    if not @operation_counter[user_id]?
-      @operation_counter[user_id] = 0
-    uid =
-      'creator' : user_id
-      'op_number' : @operation_counter[user_id]
-    @operation_counter[user_id]++
-    uid
-
-  #
-  # Retrieve an operation from a unique id.
-  #
-  # when uid has a "sub" property, the value of it will be applied
-  # on the operations retrieveSub method (which must! be defined)
-  #
-  getOperation: (uid)->
-    if uid.uid?
-      uid = uid.uid
-    o = @buffer[uid.creator]?[uid.op_number]
-    if uid.sub? and o?
-      o.retrieveSub uid.sub
-    else
-      o
-
-  #
-  # Add an operation to the HB. Note that this will not link it against
-  # other operations (it wont executed)
-  #
-  addOperation: (o)->
-    if not @buffer[o.uid.creator]?
-      @buffer[o.uid.creator] = {}
-    if @buffer[o.uid.creator][o.uid.op_number]?
-      throw new Error "You must not overwrite operations!"
-    if (o.uid.op_number.constructor isnt String) and (not @isExpectedOperation(o)) and (not o.fromHB?) # you already do this in the engine, so delete it here!
-      throw new Error "this operation was not expected!"
-    @addToCounter(o)
-    @buffer[o.uid.creator][o.uid.op_number] = o
-    o
-
-  removeOperation: (o)->
-    delete @buffer[o.uid.creator]?[o.uid.op_number]
-
-  # When the HB determines inconsistencies, then the invokeSync
-  # handler wil be called, which should somehow invoke the sync with another collaborator.
-  # The parameter of the sync handler is the user_id with wich an inconsistency was determined
-  setInvokeSyncHandler: (f)->
-    @invokeSync = f
-
-  # empty per default # TODO: do i need this?
-  invokeSync: ()->
-
-  # after you received the HB of another user (in the sync process),
-  # you renew your own state_vector to the state_vector of the other user
-  renewStateVector: (state_vector)->
-    for user,state of state_vector
-      if ((not @operation_counter[user]?) or (@operation_counter[user] < state_vector[user])) and state_vector[user]?
-        @operation_counter[user] = state_vector[user]
-
-  #
-  # Increment the operation_counter that defines the current state of the Engine.
-  #
-  addToCounter: (o)->
-    @operation_counter[o.uid.creator] ?= 0
-    # TODO: check if operations are send in order
-    if o.uid.op_number is @operation_counter[o.uid.creator]
-      @operation_counter[o.uid.creator]++
-    while @buffer[o.uid.creator][@operation_counter[o.uid.creator]]?
-      @operation_counter[o.uid.creator]++
-    undefined
-
-module.exports = HistoryBuffer
--- a/lib/ObjectType.coffee
+++ b/lib/ObjectType.coffee
@@ -1,74 +0,0 @@
-
-class YObject
-
-  constructor: (@_object = {})->
-    if @_object.constructor is Object
-      for name, val of @_object
-        if val.constructor is Object
-          @_object[name] = new YObject(val)
-    else
-      throw new Error "Y.Object accepts Json Objects only"
-
-  _name: "Object"
-
-  _getModel: (types, ops)->
-    if not @_model?
-      @_model = new ops.MapManager(@).execute()
-      for n,o of @_object
-        @_model.val n, o
-    delete @_object
-    @_model
-
-  _setModel: (@_model)->
-    delete @_object
-
-  observe: (f)->
-    @_model.observe f
-    @
-
-  unobserve: (f)->
-    @_model.unobserve f
-    @
-
-  #
-  # @overload val()
-  #   Get this as a Json object.
-  #   @return [Json]
-  #
-  # @overload val(name)
-  #   Get value of a property.
-  #   @param {String} name Name of the object property.
-  #   @return [*] Depends on the value of the property.
-  #
-  # @overload val(name, content)
-  #   Set a new property.
-  #   @param {String} name Name of the object property.
-  #   @param {Object|String} content Content of the object property.
-  #   @return [Object Type] This object. (supports chaining)
-  #
-  val: (name, content)->
-    if @_model?
-      @_model.val.apply @_model, arguments
-    else
-      if content?
-        @_object[name] = content
-      else if name?
-        @_object[name]
-      else
-        res = {}
-        for n,v of @_object
-          res[n] = v
-        res
-
-  delete: (name)->
-    @_model.delete(name)
-    @
-
-if window?
-  if window.Y?
-    window.Y.Object = YObject
-  else
-    throw new Error "You must first import Y!"
-
-if module?
-  module.exports = YObject
--- a/lib/Operations/Basic.coffee
+++ b/lib/Operations/Basic.coffee
@@ -1,678 +0,0 @@
-module.exports = ()->
-  # @see Engine.parse
-  ops = {}
-  execution_listener = []
-
-  #
-  # @private
-  # @abstract
-  # @nodoc
-  # A generic interface to ops.
-  #
-  # An operation has the following methods:
-  # * _encode: encodes an operation (needed only if instance of this operation is sent).
-  # * execute: execute the effects of this operations. Good examples are Insert-type and AddName-type
-  # * val: in the case that the operation holds a value
-  #
-  # Furthermore an encodable operation has a parser. We extend the parser object in order to parse encoded operations.
-  #
-  class ops.Operation
-
-    #
-    # @param {Object} uid A unique identifier.
-    # If uid is undefined, a new uid will be created before at the end of the execution sequence
-    #
-    constructor: (custom_type, uid, content, content_operations)->
-      if custom_type?
-        @custom_type = custom_type
-      @is_deleted = false
-      @garbage_collected = false
-      @event_listeners = [] # TODO: rename to observers or sth like that
-      if uid?
-        @uid = uid
-
-      # see encode to see, why we are doing it this way
-      if content is undefined
-        # nop
-      else if content? and content.creator?
-        @saveOperation 'content', content
-      else
-        @content = content
-      if content_operations?
-        @content_operations = {}
-        for name, op of content_operations
-          @saveOperation name, op, 'content_operations'
-
-    type: "Operation"
-
-    getContent: (name)->
-      if @content?
-        if @content.getCustomType?
-          @content.getCustomType()
-        else if @content.constructor is Object
-          if name?
-            if @content[name]?
-              @content[name]
-            else
-              @content_operations[name].getCustomType()
-          else
-            content = {}
-            for n,v of @content
-              content[n] = v
-            if @content_operations?
-              for n,v of @content_operations
-                v = v.getCustomType()
-                content[n] = v
-            content
-        else
-          @content
-      else
-        @content
-
-    retrieveSub: ()->
-      throw new Error "sub properties are not enable on this operation type!"
-
-    #
-    # Add an event listener. It depends on the operation which events are supported.
-    # @param {Function} f f is executed in case the event fires.
-    #
-    observe: (f)->
-      @event_listeners.push f
-
-    #
-    # Deletes function from the observer list
-    # @see Operation.observe
-    #
-    # @overload unobserve(event, f)
-    #   @param f     {Function} The function that you want to delete
-    unobserve: (f)->
-      @event_listeners = @event_listeners.filter (g)->
-        f isnt g
-
-    #
-    # Deletes all subscribed event listeners.
-    # This should be called, e.g. after this has been replaced.
-    # (Then only one replace event should fire. )
-    # This is also called in the cleanup method.
-    deleteAllObservers: ()->
-      @event_listeners = []
-
-    delete: ()->
-      (new ops.Delete undefined, @).execute()
-      null
-
-    #
-    # Fire an event.
-    # TODO: Do something with timeouts. You don't want this to fire for every operation (e.g. insert).
-    # TODO: do you need callEvent+forwardEvent? Only one suffices probably
-    callEvent: ()->
-      if @custom_type?
-        callon = @getCustomType()
-      else
-        callon = @
-      @forwardEvent callon, arguments...
-
-    #
-    # Fire an event and specify in which context the listener is called (set 'this').
-    # TODO: do you need this ?
-    forwardEvent: (op, args...)->
-      for f in @event_listeners
-        f.call op, args...
-
-    isDeleted: ()->
-      @is_deleted
-
-    applyDelete: (garbagecollect = true)->
-      if not @garbage_collected
-        #console.log "applyDelete: #{@type}"
-        @is_deleted = true
-        if garbagecollect
-          @garbage_collected = true
-          @HB.addToGarbageCollector @
-
-    cleanup: ()->
-      #console.log "cleanup: #{@type}"
-      @HB.removeOperation @
-      @deleteAllObservers()
-
-    #
-    # Set the parent of this operation.
-    #
-    setParent: (@parent)->
-
-    #
-    # Get the parent of this operation.
-    #
-    getParent: ()->
-      @parent
-
-    #
-    # Computes a unique identifier (uid) that identifies this operation.
-    #
-    getUid: ()->
-      if not @uid.noOperation?
-        @uid
-      else
-        if @uid.alt? # could be (safely) undefined
-          map_uid = @uid.alt.cloneUid()
-          map_uid.sub = @uid.sub
-          map_uid
-        else
-          undefined
-
-    cloneUid: ()->
-      uid = {}
-      for n,v of @getUid()
-        uid[n] = v
-      uid
-
-    #
-    # @private
-    # If not already done, set the uid
-    # Add this to the HB
-    # Notify the all the listeners.
-    #
-    execute: ()->
-      if @validateSavedOperations()
-        @is_executed = true
-        if not @uid?
-          # When this operation was created without a uid, then set it here.
-          # There is only one other place, where this can be done - before an Insertion
-          # is executed (because we need the creator_id)
-          @uid = @HB.getNextOperationIdentifier()
-        if not @uid.noOperation?
-          @HB.addOperation @
-          for l in execution_listener
-            l @_encode()
-        @
-      else
-        false
-
-    #
-    # @private
-    # Operations may depend on other operations (linked lists, etc.).
-    # The saveOperation and validateSavedOperations methods provide
-    # an easy way to refer to these operations via an uid or object reference.
-    #
-    # For example: We can create a new Delete operation that deletes the operation $o like this
-    #     - var d = new Delete(uid, $o);   or
-    #     - var d = new Delete(uid, $o.getUid());
-    # Either way we want to access $o via d.deletes. In the second case validateSavedOperations must be called first.
-    #
-    # @overload saveOperation(name, op_uid)
-    #   @param {String} name The name of the operation. After validating (with validateSavedOperations) the instantiated operation will be accessible via this[name].
-    #   @param {Object} op_uid A uid that refers to an operation
-    # @overload saveOperation(name, op)
-    #   @param {String} name The name of the operation. After calling this function op is accessible via this[name].
-    #   @param {Operation} op An Operation object
-    #
-    saveOperation: (name, op, base = "this")->
-      if op? and op._getModel?
-        op = op._getModel(@custom_types, @operations)
-      #
-      # Every instance of $Operation must have an $execute function.
-      # We use duck-typing to check if op is instantiated since there
-      # could exist multiple classes of $Operation
-      #
-      if not op?
-        # nop
-      else if op.execute? or not (op.op_number? and op.creator?)
-        # is instantiated, or op is string. Currently "Delimiter" is saved as string
-        # (in combination with @parent you can retrieve the delimiter..)
-        if base is "this"
-          @[name] = op
-        else
-          dest = @[base]
-          paths = name.split("/")
-          last_path = paths.pop()
-          for path in paths
-            dest = dest[path]
-          dest[last_path] = op
-      else
-        # not initialized. Do it when calling $validateSavedOperations()
-        @unchecked ?= {}
-        @unchecked[base] ?= {}
-        @unchecked[base][name] = op
-
-    #
-    # @private
-    # After calling this function all not instantiated operations will be accessible.
-    # @see Operation.saveOperation
-    #
-    # @return [Boolean] Whether it was possible to instantiate all operations.
-    #
-    validateSavedOperations: ()->
-      uninstantiated = {}
-      success = true
-      for base_name, base of @unchecked
-        for name, op_uid of base
-          op = @HB.getOperation op_uid
-          if op
-            if base_name is "this"
-              @[name] = op
-            else
-              dest = @[base_name]
-              paths = name.split("/")
-              last_path = paths.pop()
-              for path in paths
-                dest = dest[path]
-              dest[last_path] = op
-          else
-            uninstantiated[base_name] ?= {}
-            uninstantiated[base_name][name] = op_uid
-            success = false
-      if not success
-        @unchecked = uninstantiated
-        return false
-      else
-        delete @unchecked
-        return @
-
-    getCustomType: ()->
-      if not @custom_type?
-        # throw new Error "This operation was not initialized with a custom type"
-        @
-      else
-        if @custom_type.constructor is String
-          # has not been initialized yet (only the name is specified)
-          Type = @custom_types
-          for t in @custom_type.split(".")
-            Type = Type[t]
-          @custom_type = new Type()
-          @custom_type._setModel @
-        @custom_type
-
-    #
-    # @private
-    # Encode this operation in such a way that it can be parsed by remote peers.
-    #
-    _encode: (json = {})->
-      json.type = @type
-      json.uid = @getUid()
-      if @custom_type?
-        if @custom_type.constructor is String
-          json.custom_type = @custom_type
-        else
-          json.custom_type = @custom_type._name
-
-      if @content?.getUid?
-        json.content = @content.getUid()
-      else
-        json.content = @content
-      if @content_operations?
-        operations = {}
-        for n,o of @content_operations
-          if o._getModel?
-            o = o._getModel(@custom_types, @operations)
-          operations[n] = o.getUid()
-        json.content_operations = operations
-      json
-
-  #
-  # @nodoc
-  # A simple Delete-type operation that deletes an operation.
-  #
-  class ops.Delete extends ops.Operation
-
-    #
-    # @param {Object} uid A unique identifier. If uid is undefined, a new uid will be created.
-    # @param {Object} deletes UID or reference of the operation that this to be deleted.
-    #
-    constructor: (custom_type, uid, deletes)->
-      @saveOperation 'deletes', deletes
-      super custom_type, uid
-
-    type: "Delete"
-
-    #
-    # @private
-    # Convert all relevant information of this operation to the json-format.
-    # This result can be sent to other clients.
-    #
-    _encode: ()->
-      {
-        'type': "Delete"
-        'uid': @getUid()
-        'deletes': @deletes.getUid()
-      }
-
-    #
-    # @private
-    # Apply the deletion.
-    #
-    execute: ()->
-      if @validateSavedOperations()
-        res = super
-        if res
-          @deletes.applyDelete @
-        res
-      else
-        false
-
-  #
-  # Define how to parse Delete operations.
-  #
-  ops.Delete.parse = (o)->
-    {
-      'uid' : uid
-      'deletes': deletes_uid
-    } = o
-    new this(null, uid, deletes_uid)
-
-  #
-  # @nodoc
-  # A simple insert-type operation.
-  #
-  # An insert operation is always positioned between two other insert operations.
-  # Internally this is realized as associative lists, whereby each insert operation has a predecessor and a successor.
-  # For the sake of efficiency we maintain two lists:
-  #   - The short-list (abbrev. sl) maintains only the operations that are not deleted (unimplemented, good idea?)
-  #   - The complete-list (abbrev. cl) maintains all operations
-  #
-  class ops.Insert extends ops.Operation
-
-    #
-    # @param {Object} uid A unique identifier. If uid is undefined, a new uid will be created.
-    # @param {Operation} prev_cl The predecessor of this operation in the complete-list (cl)
-    # @param {Operation} next_cl The successor of this operation in the complete-list (cl)
-    #
-    constructor: (custom_type, content, content_operations, parent, uid, prev_cl, next_cl, origin)->
-      @saveOperation 'parent', parent
-      @saveOperation 'prev_cl', prev_cl
-      @saveOperation 'next_cl', next_cl
-      if origin?
-        @saveOperation 'origin', origin
-      else
-        @saveOperation 'origin', prev_cl
-      super custom_type, uid, content, content_operations
-
-    type: "Insert"
-
-    val: ()->
-      @getContent()
-
-    getNext: (i=1)->
-      n = @
-      while i > 0 and n.next_cl?
-        n = n.next_cl
-        if not n.is_deleted
-          i--
-      if n.is_deleted
-        null
-      n
-
-    getPrev: (i=1)->
-      n = @
-      while i > 0 and n.prev_cl?
-        n = n.prev_cl
-        if not n.is_deleted
-          i--
-      if n.is_deleted
-        null
-      else
-        n
-
-    #
-    # set content to null and other stuff
-    # @private
-    #
-    applyDelete: (o)->
-      @deleted_by ?= []
-      callLater = false
-      if @parent? and not @is_deleted and o? # o? : if not o?, then the delimiter deleted this Insertion. Furthermore, it would be wrong to call it. TODO: make this more expressive and save
-        # call iff wasn't deleted earlyer
-        callLater = true
-      if o?
-        @deleted_by.push o
-      garbagecollect = false
-      if @next_cl.isDeleted()
-        garbagecollect = true
-      super garbagecollect
-      if callLater
-        @parent.callOperationSpecificDeleteEvents(this, o)
-      if @prev_cl? and @prev_cl.isDeleted()
-        # garbage collect prev_cl
-        @prev_cl.applyDelete()
-
-    cleanup: ()->
-      if @next_cl.isDeleted()
-        # delete all ops that delete this insertion
-        for d in @deleted_by
-          d.cleanup()
-
-        # throw new Error "right is not deleted. inconsistency!, wrararar"
-        # change origin references to the right
-        o = @next_cl
-        while o.type isnt "Delimiter"
-          if o.origin is @
-            o.origin = @prev_cl
-          o = o.next_cl
-        # reconnect left/right
-        @prev_cl.next_cl = @next_cl
-        @next_cl.prev_cl = @prev_cl
-
-        # delete content
-        # - we must not do this in applyDelete, because this would lead to inconsistencies
-        # (e.g. the following operation order must be invertible :
-        #   Insert refers to content, then the content is deleted)
-        # Therefore, we have to do this in the cleanup
-        # * NODE: We never delete Insertions!
-        if @content instanceof ops.Operation and not (@content instanceof ops.Insert)
-          @content.referenced_by--
-          if @content.referenced_by <= 0 and not @content.is_deleted
-            @content.applyDelete()
-        delete @content
-        super
-      # else
-      #   Someone inserted something in the meantime.
-      #   Remember: this can only be garbage collected when next_cl is deleted
-
-    #
-    # @private
-    # The amount of positions that $this operation was moved to the right.
-    #
-    getDistanceToOrigin: ()->
-      d = 0
-      o = @prev_cl
-      while true
-        if @origin is o
-          break
-        d++
-        o = o.prev_cl
-      d
-
-    #
-    # @private
-    # Include this operation in the associative lists.
-    execute: ()->
-      if not @validateSavedOperations()
-        return false
-      else
-        if @content instanceof ops.Operation
-          @content.insert_parent = @ # TODO: this is probably not necessary and only nice for debugging
-          @content.referenced_by ?= 0
-          @content.referenced_by++
-        if @parent?
-          if not @prev_cl?
-            @prev_cl = @parent.beginning
-          if not @origin?
-            @origin = @prev_cl
-          else if @origin is "Delimiter"
-            @origin = @parent.beginning
-          if not @next_cl?
-            @next_cl = @parent.end
-        if @prev_cl?
-          distance_to_origin = @getDistanceToOrigin() # most cases: 0
-          o = @prev_cl.next_cl
-          i = distance_to_origin # loop counter
-
-          # $this has to find a unique position between origin and the next known character
-          # case 1: $origin equals $o.origin: the $creator parameter decides if left or right
-          #         let $OL= [o1,o2,o3,o4], whereby $this is to be inserted between o1 and o4
-          #         o2,o3 and o4 origin is 1 (the position of o2)
-          #         there is the case that $this.creator < o2.creator, but o3.creator < $this.creator
-          #         then o2 knows o3. Since on another client $OL could be [o1,o3,o4] the problem is complex
-          #         therefore $this would be always to the right of o3
-          # case 2: $origin < $o.origin
-          #         if current $this insert_position > $o origin: $this ins
-          #         else $insert_position will not change
-          #         (maybe we encounter case 1 later, then this will be to the right of $o)
-          # case 3: $origin > $o.origin
-          #         $this insert_position is to the left of $o (forever!)
-          while true
-            if o isnt @next_cl
-              # $o happened concurrently
-              if o.getDistanceToOrigin() is i
-                # case 1
-                if o.uid.creator < @uid.creator
-                  @prev_cl = o
-                  distance_to_origin = i + 1
-                else
-                  # nop
-              else if o.getDistanceToOrigin() < i
-                # case 2
-                if i - distance_to_origin <= o.getDistanceToOrigin()
-                  @prev_cl = o
-                  distance_to_origin = i + 1
-                else
-                  #nop
-              else
-                # case 3
-                break
-              i++
-              o = o.next_cl
-            else
-              # $this knows that $o exists,
-              break
-          # now reconnect everything
-          @next_cl = @prev_cl.next_cl
-          @prev_cl.next_cl = @
-          @next_cl.prev_cl = @
-
-        @setParent @prev_cl.getParent() # do Insertions always have a parent?
-        super # notify the execution_listeners
-        @parent.callOperationSpecificInsertEvents(this)
-        @
-
-    #
-    # Compute the position of this operation.
-    #
-    getPosition: ()->
-      position = 0
-      prev = @prev_cl
-      while true
-        if prev instanceof ops.Delimiter
-          break
-        if not prev.isDeleted()
-          position++
-        prev = prev.prev_cl
-      position
-
-    #
-    # Convert all relevant information of this operation to the json-format.
-    # This result can be send to other clients.
-    #
-    _encode: (json = {})->
-      json.prev = @prev_cl.getUid()
-      json.next = @next_cl.getUid()
-
-      if @origin.type is "Delimiter"
-        json.origin = "Delimiter"
-      else if @origin isnt @prev_cl
-        json.origin = @origin.getUid()
-
-      # if not (json.prev? and json.next?)
-      json.parent = @parent.getUid()
-
-      super json
-
-  ops.Insert.parse = (json)->
-    {
-      'content' : content
-      'content_operations' : content_operations
-      'uid' : uid
-      'prev': prev
-      'next': next
-      'origin' : origin
-      'parent' : parent
-    } = json
-    new this null, content, content_operations, parent, uid, prev, next, origin
-
-  #
-  # @nodoc
-  # A delimiter is placed at the end and at the beginning of the associative lists.
-  # This is necessary in order to have a beginning and an end even if the content
-  # of the Engine is empty.
-  #
-  class ops.Delimiter extends ops.Operation
-    #
-    # @param {Object} uid A unique identifier. If uid is undefined, a new uid will be created.
-    # @param {Operation} prev_cl The predecessor of this operation in the complete-list (cl)
-    # @param {Operation} next_cl The successor of this operation in the complete-list (cl)
-    #
-    constructor: (prev_cl, next_cl, origin)->
-      @saveOperation 'prev_cl', prev_cl
-      @saveOperation 'next_cl', next_cl
-      @saveOperation 'origin', prev_cl
-      super null, {noOperation: true}
-
-    type: "Delimiter"
-
-    applyDelete: ()->
-      super()
-      o = @prev_cl
-      while o?
-        o.applyDelete()
-        o = o.prev_cl
-      undefined
-
-    cleanup: ()->
-      super()
-
-    #
-    # @private
-    #
-    execute: ()->
-      if @unchecked?['next_cl']?
-        super
-      else if @unchecked?['prev_cl']
-        if @validateSavedOperations()
-          if @prev_cl.next_cl?
-            throw new Error "Probably duplicated operations"
-          @prev_cl.next_cl = @
-          super
-        else
-          false
-      else if @prev_cl? and not @prev_cl.next_cl?
-        delete @prev_cl.unchecked.next_cl
-        @prev_cl.next_cl = @
-        super
-      else if @prev_cl? or @next_cl? or true # TODO: are you sure? This can happen right?
-        super
-      #else
-      #  throw new Error "Delimiter is unsufficient defined!"
-
-    #
-    # @private
-    #
-    _encode: ()->
-      {
-        'type' : @type
-        'uid' : @getUid()
-        'prev' : @prev_cl?.getUid()
-        'next' : @next_cl?.getUid()
-      }
-
-  ops.Delimiter.parse = (json)->
-    {
-    'uid' : uid
-    'prev' : prev
-    'next' : next
-    } = json
-    new this(uid, prev, next)
-
-  # This is what this module exports after initializing it with the HistoryBuffer
-  {
-    'operations' : ops
-    'execution_listener' : execution_listener
-  }
--- a/lib/Operations/Structured.coffee
+++ b/lib/Operations/Structured.coffee
@@ -1,533 +0,0 @@
-basic_ops_uninitialized = require "./Basic"
-
-module.exports = ()->
-  basic_ops = basic_ops_uninitialized()
-  ops = basic_ops.operations
-
-  #
-  # @nodoc
-  # Manages map like objects. E.g. Json-Type and XML attributes.
-  #
-  class ops.MapManager extends ops.Operation
-
-    #
-    # @param {Object} uid A unique identifier. If uid is undefined, a new uid will be created.
-    #
-    constructor: (custom_type, uid, content, content_operations)->
-      @_map = {}
-      super custom_type, uid, content, content_operations
-
-    type: "MapManager"
-
-    applyDelete: ()->
-      for name,p of @_map
-        p.applyDelete()
-      super()
-
-    cleanup: ()->
-      super()
-
-    map: (f)->
-      for n,v of @_map
-        f(n,v)
-      undefined
-
-    #
-    # @see JsonOperations.val
-    #
-    val: (name, content)->
-      if arguments.length > 1
-        if content? and content._getModel?
-          rep = content._getModel(@custom_types, @operations)
-        else
-          rep = content
-        @retrieveSub(name).replace rep
-        @getCustomType()
-      else if name?
-        prop = @_map[name]
-        if prop? and not prop.isContentDeleted()
-          res = prop.val()
-          if res instanceof ops.Operation
-            res.getCustomType()
-          else
-            res
-        else
-          undefined
-      else
-        result = {}
-        for name,o of @_map
-          if not o.isContentDeleted()
-            result[name] = o.val()
-        result
-
-    delete: (name)->
-      @_map[name]?.deleteContent()
-      @
-
-    retrieveSub: (property_name)->
-      if not @_map[property_name]?
-        event_properties =
-          name: property_name
-        event_this = @
-        rm_uid =
-          noOperation: true
-          sub: property_name
-          alt: @
-        rm = new ops.ReplaceManager null, event_properties, event_this, rm_uid # this operation shall not be saved in the HB
-        @_map[property_name] = rm
-        rm.setParent @, property_name
-        rm.execute()
-      @_map[property_name]
-
-  ops.MapManager.parse = (json)->
-    {
-      'uid' : uid
-      'custom_type' : custom_type
-      'content' : content
-      'content_operations' : content_operations
-    } = json
-    new this(custom_type, uid, content, content_operations)
-
-
-
-  #
-  # @nodoc
-  # Manages a list of Insert-type operations.
-  #
-  class ops.ListManager extends ops.Operation
-
-    #
-    # A ListManager maintains a non-empty list that has a beginning and an end (both Delimiters!)
-    # @param {Object} uid A unique identifier. If uid is undefined, a new uid will be created.
-    # @param {Delimiter} beginning Reference or Object.
-    # @param {Delimiter} end Reference or Object.
-    constructor: (custom_type, uid, content, content_operations)->
-      @beginning = new ops.Delimiter undefined, undefined
-      @end =       new ops.Delimiter @beginning, undefined
-      @beginning.next_cl = @end
-      @beginning.execute()
-      @end.execute()
-      super custom_type, uid, content, content_operations
-
-    type: "ListManager"
-
-
-    applyDelete: ()->
-      o = @beginning
-      while o?
-        o.applyDelete()
-        o = o.next_cl
-      super()
-
-    cleanup: ()->
-      super()
-
-
-    toJson: (transform_to_value = false)->
-      val = @val()
-      for i, o in val
-        if o instanceof ops.Object
-          o.toJson(transform_to_value)
-        else if o instanceof ops.ListManager
-          o.toJson(transform_to_value)
-        else if transform_to_value and o instanceof ops.Operation
-          o.val()
-        else
-          o
-
-    #
-    # @private
-    # @see Operation.execute
-    #
-    execute: ()->
-      if @validateSavedOperations()
-        @beginning.setParent @
-        @end.setParent @
-        super
-      else
-        false
-
-    # Get the element previous to the delemiter at the end
-    getLastOperation: ()->
-      @end.prev_cl
-
-    # similar to the above
-    getFirstOperation: ()->
-      @beginning.next_cl
-
-    # Transforms the the list to an array
-    # Doesn't return left-right delimiter.
-    toArray: ()->
-      o = @beginning.next_cl
-      result = []
-      while o isnt @end
-        if not o.is_deleted
-          result.push o.val()
-        o = o.next_cl
-      result
-
-    map: (f)->
-      o = @beginning.next_cl
-      result = []
-      while o isnt @end
-        if not o.is_deleted
-          result.push f(o)
-        o = o.next_cl
-      result
-
-    fold: (init, f)->
-      o = @beginning.next_cl
-      while o isnt @end
-        if not o.is_deleted
-          init = f(init, o)
-        o = o.next_cl
-      init
-
-    val: (pos)->
-      if pos?
-        o = @getOperationByPosition(pos+1)
-        if not (o instanceof ops.Delimiter)
-          o.val()
-        else
-          throw new Error "this position does not exist"
-      else
-        @toArray()
-
-    ref: (pos)->
-      if pos?
-        o = @getOperationByPosition(pos+1)
-        if not (o instanceof ops.Delimiter)
-          o
-        else
-          null
-          # throw new Error "this position does not exist"
-      else
-        throw new Error "you must specify a position parameter"
-
-    #
-    # Retrieves the x-th not deleted element.
-    # e.g. "abc" : the 1th character is "a"
-    # the 0th character is the left Delimiter
-    #
-    getOperationByPosition: (position)->
-      o = @beginning
-      while true
-        # find the i-th op
-        if o instanceof ops.Delimiter and o.prev_cl?
-          # the user or you gave a position parameter that is to big
-          # for the current array. Therefore we reach a Delimiter.
-          # Then, we'll just return the last character.
-          o = o.prev_cl
-          while o.isDeleted() and o.prev_cl?
-            o = o.prev_cl
-          break
-        if position <= 0 and not o.isDeleted()
-          break
-
-        o = o.next_cl
-        if not o.isDeleted()
-          position -= 1
-      o
-
-    push: (content)->
-      @insertAfter @end.prev_cl, [content]
-
-    insertAfter: (left, contents)->
-      right = left.next_cl
-      while right.isDeleted()
-        right = right.next_cl # find the first character to the right, that is not deleted. In the case that position is 0, its the Delimiter.
-      left = right.prev_cl
-
-      # TODO: always expect an array as content. Then you can combine this with the other option (else)
-      if contents instanceof ops.Operation
-        (new ops.Insert null, content, null, undefined, undefined, left, right).execute()
-      else
-        for c in contents
-          if c? and c._name? and c._getModel?
-            c = c._getModel(@custom_types, @operations)
-          tmp = (new ops.Insert null, c, null, undefined, undefined, left, right).execute()
-          left = tmp
-      @
-
-    #
-    # Inserts an array of content into this list.
-    # @Note: This expects an array as content!
-    #
-    # @return {ListManager Type} This String object.
-    #
-    insert: (position, contents)->
-      ith = @getOperationByPosition position
-      # the (i-1)th character. e.g. "abc" the 1th character is "a"
-      # the 0th character is the left Delimiter
-      @insertAfter ith, contents
-
-    #
-    # Deletes a part of the word.
-    #
-    # @return {ListManager Type} This String object
-    #
-    delete: (position, length = 1)->
-      o = @getOperationByPosition(position+1) # position 0 in this case is the deletion of the first character
-
-      delete_ops = []
-      for i in [0...length]
-        if o instanceof ops.Delimiter
-          break
-        d = (new ops.Delete null, undefined, o).execute()
-        o = o.next_cl
-        while (not (o instanceof ops.Delimiter)) and o.isDeleted()
-          o = o.next_cl
-        delete_ops.push d._encode()
-      @
-
-
-    callOperationSpecificInsertEvents: (op)->
-      getContentType = (content)->
-        if content instanceof ops.Operation
-          content.getCustomType()
-        else
-          content
-      @callEvent [
-        type: "insert"
-        reference: op
-        position: op.getPosition()
-        object: @getCustomType()
-        changedBy: op.uid.creator
-        value: getContentType op.val()
-      ]
-
-    callOperationSpecificDeleteEvents: (op, del_op)->
-      @callEvent [
-        type: "delete"
-        reference: op
-        position: op.getPosition()
-        object: @getCustomType() # TODO: You can combine getPosition + getParent in a more efficient manner! (only left Delimiter will hold @parent)
-        length: 1
-        changedBy: del_op.uid.creator
-        oldValue: op.val()
-      ]
-
-  ops.ListManager.parse = (json)->
-    {
-      'uid' : uid
-      'custom_type': custom_type
-      'content' : content
-      'content_operations' : content_operations
-    } = json
-    new this(custom_type, uid, content, content_operations)
-
-  class ops.Composition extends ops.ListManager
-
-    constructor: (custom_type, @_composition_value, composition_value_operations, uid, tmp_composition_ref)->
-      # we can't use @seveOperation 'composition_ref', tmp_composition_ref here,
-      # because then there is a "loop" (insertion refers to parent, refers to insertion..)
-      # This is why we have to check in @callOperationSpecificInsertEvents until we find it
-      super custom_type, uid
-      if tmp_composition_ref?
-        @tmp_composition_ref = tmp_composition_ref
-      else
-        @composition_ref = @end.prev_cl
-      if composition_value_operations?
-        @composition_value_operations = {}
-        for n,o of composition_value_operations
-          @saveOperation n, o, '_composition_value'
-
-    type: "Composition"
-
-    #
-    # @private
-    # @see Operation.execute
-    #
-    execute: ()->
-      if @validateSavedOperations()
-        @getCustomType()._setCompositionValue @_composition_value
-        delete @_composition_value
-        # check if tmp_composition_ref already exists
-        if @tmp_composition_ref
-          composition_ref = @HB.getOperation @tmp_composition_ref
-          if composition_ref?
-            delete @tmp_composition_ref
-            @composition_ref = composition_ref
-        super
-      else
-        false
-
-    #
-    # This is called, when the Insert-operation was successfully executed.
-    #
-    callOperationSpecificInsertEvents: (op)->
-      if @tmp_composition_ref?
-        if op.uid.creator is @tmp_composition_ref.creator and op.uid.op_number is @tmp_composition_ref.op_number
-          @composition_ref = op
-          delete @tmp_composition_ref
-          op = op.next_cl
-          if op is @end
-            return
-        else
-          return
-
-      o = @end.prev_cl
-      while o isnt op
-        @getCustomType()._unapply o.undo_delta
-        o = o.prev_cl
-      while o isnt @end
-        o.undo_delta = @getCustomType()._apply o.val()
-        o = o.next_cl
-      @composition_ref = @end.prev_cl
-
-      @callEvent [
-        type: "update"
-        changedBy: op.uid.creator
-        newValue: @val()
-      ]
-
-    callOperationSpecificDeleteEvents: (op, del_op)->
-      return
-
-    #
-    # Create a new Delta
-    # - inserts new Content at the end of the list
-    # - updates the composition_value
-    # - updates the composition_ref
-    #
-    # @param delta The delta that is applied to the composition_value
-    #
-    applyDelta: (delta, operations)->
-      (new ops.Insert null, delta, operations, @, null, @end.prev_cl, @end).execute()
-      undefined
-
-    #
-    # Encode this operation in such a way that it can be parsed by remote peers.
-    #
-    _encode: (json = {})->
-      custom = @getCustomType()._getCompositionValue()
-      json.composition_value = custom.composition_value
-      if custom.composition_value_operations?
-        json.composition_value_operations = {}
-        for n,o of custom.composition_value_operations
-          json.composition_value_operations[n] = o.getUid()
-      if @composition_ref?
-        json.composition_ref = @composition_ref.getUid()
-      else
-        json.composition_ref = @tmp_composition_ref
-      super json
-
-  ops.Composition.parse = (json)->
-    {
-      'uid' : uid
-      'custom_type': custom_type
-      'composition_value' : composition_value
-      'composition_value_operations' : composition_value_operations
-      'composition_ref' : composition_ref
-    } = json
-    new this(custom_type, composition_value, composition_value_operations, uid, composition_ref)
-
-
-  #
-  # @nodoc
-  # Adds support for replace. The ReplaceManager manages Replaceable operations.
-  # Each Replaceable holds a value that is now replaceable.
-  #
-  # The TextType-type has implemented support for replace
-  # @see TextType
-  #
-  class ops.ReplaceManager extends ops.ListManager
-    #
-    # @param {Object} event_properties Decorates the event that is thrown by the RM
-    # @param {Object} event_this The object on which the event shall be executed
-    # @param {Operation} initial_content Initialize this with a Replaceable that holds the initial_content.
-    # @param {Object} uid A unique identifier. If uid is undefined, a new uid will be created.
-    # @param {Delimiter} beginning Reference or Object.
-    # @param {Delimiter} end Reference or Object.
-    constructor: (custom_type, @event_properties, @event_this, uid)->
-      if not @event_properties['object']?
-        @event_properties['object'] = @event_this.getCustomType()
-      super custom_type, uid
-
-    type: "ReplaceManager"
-
-    #
-    # This doesn't throw the same events as the ListManager. Therefore, the
-    # Replaceables also not throw the same events.
-    # So, ReplaceManager and ListManager both implement
-    # these functions that are called when an Insertion is executed (at the end).
-    #
-    #
-    callEventDecorator: (events)->
-      if not @isDeleted()
-        for event in events
-          for name,prop of @event_properties
-            event[name] = prop
-        @event_this.callEvent events
-      undefined
-
-    #
-    # This is called, when the Insert-type was successfully executed.
-    # TODO: consider doing this in a more consistent manner. This could also be
-    # done with execute. But currently, there are no specital Insert-ops for ListManager.
-    #
-    callOperationSpecificInsertEvents: (op)->
-      if op.next_cl.type is "Delimiter" and op.prev_cl.type isnt "Delimiter"
-        # this replaces another Replaceable
-        if not op.is_deleted # When this is received from the HB, this could already be deleted!
-          old_value = op.prev_cl.val()
-          @callEventDecorator [
-            type: "update"
-            changedBy: op.uid.creator
-            oldValue: old_value
-          ]
-        op.prev_cl.applyDelete()
-      else if op.next_cl.type isnt "Delimiter"
-        # This won't be recognized by the user, because another
-        # concurrent operation is set as the current value of the RM
-        op.applyDelete()
-      else # prev _and_ next are Delimiters. This is the first created Replaceable in the RM
-        @callEventDecorator [
-          type: "add"
-          changedBy: op.uid.creator
-        ]
-      undefined
-
-    callOperationSpecificDeleteEvents: (op, del_op)->
-      if op.next_cl.type is "Delimiter"
-        @callEventDecorator [
-          type: "delete"
-          changedBy: del_op.uid.creator
-          oldValue: op.val()
-        ]
-
-
-    #
-    # Replace the existing word with a new word.
-    #
-    # @param content {Operation} The new value of this ReplaceManager.
-    # @param replaceable_uid {UID} Optional: Unique id of the Replaceable that is created
-    #
-    replace: (content, replaceable_uid)->
-      o = @getLastOperation()
-      relp = (new ops.Insert null, content, null, @, replaceable_uid, o, o.next_cl).execute()
-      # TODO: delete repl (for debugging)
-      undefined
-
-    isContentDeleted: ()->
-      @getLastOperation().isDeleted()
-
-    deleteContent: ()->
-      last_op = @getLastOperation()
-      if (not last_op.isDeleted()) and last_op.type isnt "Delimiter"
-        (new ops.Delete null, undefined, @getLastOperation().uid).execute()
-      undefined
-
-    #
-    # Get the value of this
-    # @return {String}
-    #
-    val: ()->
-      o = @getLastOperation()
-      #if o instanceof ops.Delimiter
-        # throw new Error "Replace Manager doesn't contain anything."
-      o.val?() # ? - for the case that (currently) the RM does not contain anything (then o is a Delimiter)
-
-
-
-  basic_ops
--- a/lib/y-object.coffee
+++ b/lib/y-object.coffee
@@ -1,55 +0,0 @@
-
-bindToChildren = (that)->
-  for i in [0...that.children.length]
-    attr = that.children.item(i)
-    if attr.name?
-      attr.val = that.val.val(attr.name)
-  that.val.observe (events)->
-    for event in events
-      if event.name?
-        for i in [0...that.children.length]
-          attr = that.children.item(i)
-          if attr.name? and attr.name is event.name
-            newVal = that.val.val(attr.name)
-            if attr.val isnt newVal
-              attr.val = newVal
-
-Polymer "y-object",
-  ready: ()->
-    if @connector?
-      @val = new Y @connector
-      bindToChildren @
-    else if @val?
-      bindToChildren @
-
-  valChanged: ()->
-    if @val? and @val._name is "Object"
-      bindToChildren @
-
-  connectorChanged: ()->
-    if (not @val?)
-      @val = new Y @connector
-      bindToChildren @
-
-Polymer "y-property",
-  ready: ()->
-    if @val? and @name?
-      if @val.constructor is Object
-        @val = @parentElement.val(@name,new Y.Object(@val)).val(@name)
-        # TODO: please use instanceof instead of ._name,
-        # since it is more safe (consider someone putting a custom Object type here)
-      else if typeof @val is "string"
-        @parentElement.val(@name,@val)
-      if @val._name is "Object"
-        bindToChildren @
-
-  valChanged: ()->
-    if @val? and @name?
-      if @val.constructor is Object
-        @val = @parentElement.val.val(@name, new Y.Object(@val)).val(@name)
-        # TODO: please use instanceof instead of ._name,
-        # since it is more safe (consider someone putting a custom Object type here)
-      else if @val._name is "Object"
-        bindToChildren @
-      else if @parentElement.val?.val? and @val isnt @parentElement.val.val(@name)
-        @parentElement.val.val @name, @val
--- a/lib/y.coffee
+++ b/lib/y.coffee
@@ -1,38 +0,0 @@
-
-structured_ops_uninitialized = require "./Operations/Structured"
-
-HistoryBuffer = require "./HistoryBuffer"
-Engine = require "./Engine"
-adaptConnector = require "./ConnectorAdapter"
-
-createY = (connector)->
-  if connector.user_id?
-    user_id = connector.user_id # TODO: change to getUniqueId()
-  else
-    user_id = "_temp"
-    connector.when_received_state_vector_listeners = [(state_vector)->
-        HB.setUserId this.user_id, state_vector
-      ]
-  HB = new HistoryBuffer user_id
-  ops_manager = structured_ops_uninitialized HB, this.constructor
-  ops = ops_manager.operations
-
-  engine = new Engine HB, ops
-  adaptConnector connector, engine, HB, ops_manager.execution_listener
-
-  ops.Operation.prototype.HB = HB
-  ops.Operation.prototype.operations = ops
-  ops.Operation.prototype.engine = engine
-  ops.Operation.prototype.connector = connector
-  ops.Operation.prototype.custom_types = this.constructor
-
-  ct = new createY.Object()
-  model = new ops.MapManager(ct, HB.getReservedUniqueIdentifier()).execute()
-  ct._setModel model
-  ct
-
-module.exports = createY
-if window?
-  window.Y = createY
-
-createY.Object = require "./ObjectType"
--- a/package.json
+++ b/package.json
@@ -1,65 +1,65 @@
 {
  "name": "yjs",
-  "version": "0.5.2",
-  "description": "A Framework that enables Real-Time Collaboration on arbitrary data structures.",
-  "main": "./build/node/y.js",
+  "version": "0.6.20",
+  "description": "A framework for real-time p2p shared editing on arbitrary complex data types",
+  "main": "y.js",
  "scripts": {
-    "prepublish": "./node_modules/gulp/bin/gulp.js build_node",
-    "test": "./node_modules/gulp/bin/gulp.js mocha"
+    "test": "node --harmony ./node_modules/.bin/gulp test",
+    "lint": "./node_modules/.bin/standard",
+    "build": "./node_modules/.bin/standard build"
+  },
+  "pre-commit": [
+    "lint",
+    "test"
+  ],
+  "standard": {
+    "parser": "babel-eslint",
+    "ignore": [
+      "build/**",
+      "./y.js",
+      "./y.js.map"
+    ]
  },
  "repository": {
    "type": "git",
-    "url": "https://github.com/rwth-acis/yjs"
+    "url": "https://github.com/y-js/yjs.git"
  },
  "keywords": [
    "OT",
+    "Operational Transformation",
    "collaboration",
    "synchronization",
-    "ShareJS",
-    "Coweb",
+    "ShareJs",
+    "OpenCoweb",
    "concurrency"
  ],
  "author": "Kevin Jahns",
  "email": "kevin.jahns@rwth-aachen.de",
  "license": "MIT",
  "bugs": {
-    "url": "https://github.com/rwth-acis/yjs/issues"
-  },
-  "homepage": "https://dadamonad.github.io/yjs/",
-  "dependencies": {
+    "url": "https://github.com/y-js/yjs/issues"
  },
+  "homepage": "http://y-js.org",
  "devDependencies": {
-    "chai": "^2.2.0",
-    "codo": "^2.0.9",
-    "coffee-errors": "~0.8.6",
-    "coffee-script": "^1.7.1",
-    "coffeeify": "^0.6.0",
-    "gulp": "^3.8.7",
-    "gulp-browserify": "^0.5.0",
-    "gulp-cached": "^1.0.1",
-    "gulp-coffee": "^2.1.1",
-    "gulp-coffeeify": "^0.1.2",
-    "gulp-coffeelint": "^0.3.3",
-    "gulp-concat": "^2.3.4",
-    "gulp-copy": "0.0.2",
-    "gulp-debug": "^1.0.0",
-    "gulp-exit": "0.0.2",
-    "gulp-git": "^0.5.0",
-    "gulp-if": "^1.2.4",
-    "gulp-ignore": "^1.2.0",
-    "gulp-ljs": "^0.1.1",
-    "gulp-mocha": "^0.5.2",
-    "gulp-plumber": "^0.6.6",
-    "gulp-rename": "^1.2.0",
-    "gulp-rimraf": "^0.1.0",
-    "gulp-run": "^1.6.3",
-    "gulp-sourcemaps": "^1.1.1",
-    "gulp-uglify": "^0.3.1",
-    "gulp-watch": "^3.0.0",
-    "jquery": "^2.1.1",
-    "underscore": "^1.6.0",
-    "mocha": "^2.1.0",
-    "sinon": "^1.12.2",
-    "sinon-chai": "^2.7.0"
+    "babel-eslint": "^4.1.2",
+    "gulp": "^3.9.0",
+    "gulp-babel": "^5.2.1",
+    "gulp-bump": "^1.0.0",
+    "gulp-concat": "^2.6.0",
+    "gulp-filter": "^3.0.1",
+    "gulp-git": "^1.6.0",
+    "gulp-jasmine": "^2.0.1",
+    "gulp-jasmine-browser": "^0.2.3",
+    "gulp-load-plugins": "^1.0.0",
+    "gulp-shell": "^0.5.1",
+    "gulp-sourcemaps": "^1.5.2",
+    "gulp-tag-version": "^1.3.0",
+    "gulp-uglify": "^1.4.1",
+    "gulp-util": "^3.0.6",
+    "gulp-watch": "^4.3.5",
+    "minimist": "^1.2.0",
+    "pre-commit": "^1.1.1",
+    "promise-polyfill": "^2.1.0",
+    "standard": "^5.2.2"
  }
 }
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -0,0 +1,328 @@
+/* globals Y */
+'use strict'
+
+class AbstractConnector {
+  /*
+    opts contains the following information:
+     role : String Role of this client ("master" or "slave")
+     userId : String Uniquely defines the user.
+     debug: Boolean Whether to print debug messages (optional)
+  */
+  constructor (y, opts) {
+    this.y = y
+    if (opts == null) {
+      opts = {}
+    }
+    if (opts.role == null || opts.role === 'master') {
+      this.role = 'master'
+    } else if (opts.role === 'slave') {
+      this.role = 'slave'
+    } else {
+      throw new Error("Role must be either 'master' or 'slave'!")
+    }
+    this.role = opts.role
+    this.connections = {}
+    this.isSynced = false
+    this.userEventListeners = []
+    this.whenSyncedListeners = []
+    this.currentSyncTarget = null
+    this.syncingClients = []
+    this.forwardToSyncingClients = opts.forwardToSyncingClients !== false
+    this.debug = opts.debug === true
+    this.broadcastedHB = false
+    this.syncStep2 = Promise.resolve()
+  }
+  reconnect () {
+  }
+  disconnect () {
+    this.connections = {}
+    this.isSynced = false
+    this.currentSyncTarget = null
+    this.broadcastedHB = false
+    this.syncingClients = []
+    this.whenSyncedListeners = []
+    return this.y.db.stopGarbageCollector()
+  }
+  setUserId (userId) {
+    this.userId = userId
+    return this.y.db.setUserId(userId)
+  }
+  onUserEvent (f) {
+    this.userEventListeners.push(f)
+  }
+  userLeft (user) {
+    delete this.connections[user]
+    if (user === this.currentSyncTarget) {
+      this.currentSyncTarget = null
+      this.findNextSyncTarget()
+    }
+    this.syncingClients = this.syncingClients.filter(function (cli) {
+      return cli !== user
+    })
+    for (var f of this.userEventListeners) {
+      f({
+        action: 'userLeft',
+        user: user
+      })
+    }
+  }
+  userJoined (user, role) {
+    if (role == null) {
+      throw new Error('You must specify the role of the joined user!')
+    }
+    if (this.connections[user] != null) {
+      throw new Error('This user already joined!')
+    }
+    this.connections[user] = {
+      isSynced: false,
+      role: role
+    }
+    for (var f of this.userEventListeners) {
+      f({
+        action: 'userJoined',
+        user: user,
+        role: role
+      })
+    }
+    if (this.currentSyncTarget == null) {
+      this.findNextSyncTarget()
+    }
+  }
+  // Execute a function _when_ we are connected.
+  // If not connected, wait until connected
+  whenSynced (f) {
+    if (this.isSynced) {
+      f()
+    } else {
+      this.whenSyncedListeners.push(f)
+    }
+  }
+  /*
+
+   returns false, if there is no sync target
+   true otherwise
+  */
+  findNextSyncTarget () {
+    if (this.currentSyncTarget != null || this.isSynced) {
+      return // "The current sync has not finished!"
+    }
+
+    var syncUser = null
+    for (var uid in this.connections) {
+      if (!this.connections[uid].isSynced) {
+        syncUser = uid
+        break
+      }
+    }
+    if (syncUser != null) {
+      var conn = this
+      this.currentSyncTarget = syncUser
+      this.y.db.requestTransaction(function *() {
+        conn.send(syncUser, {
+          type: 'sync step 1',
+          stateSet: yield* this.getStateSet(),
+          deleteSet: yield* this.getDeleteSet()
+        })
+      })
+    } else {
+      this.isSynced = true
+      // call when synced listeners
+      for (var f of this.whenSyncedListeners) {
+        f()
+      }
+      this.whenSyncedListeners = []
+      this.y.db.requestTransaction(function *() {
+        yield* this.garbageCollectAfterSync()
+      })
+    }
+  }
+  send (uid, message) {
+    if (this.debug) {
+      console.log(`send ${this.userId} -> ${uid}: ${message.type}`, m) // eslint-disable-line
+    }
+  }
+  /*
+    You received a raw message, and you know that it is intended for Yjs. Then call this function.
+  */
+  receiveMessage (sender, m) {
+    if (sender === this.userId) {
+      return
+    }
+    if (this.debug) {
+      console.log(`receive ${sender} -> ${this.userId}: ${m.type}`, JSON.parse(JSON.stringify(m))) // eslint-disable-line
+    }
+    if (m.type === 'sync step 1') {
+      // TODO: make transaction, stream the ops
+      let conn = this
+      this.y.db.requestTransaction(function *() {
+        var currentStateSet = yield* this.getStateSet()
+        yield* this.applyDeleteSet(m.deleteSet)
+
+        var ds = yield* this.getDeleteSet()
+        var ops = yield* this.getOperations(m.stateSet)
+        conn.send(sender, {
+          type: 'sync step 2',
+          os: ops,
+          stateSet: currentStateSet,
+          deleteSet: ds
+        })
+        if (this.forwardToSyncingClients) {
+          conn.syncingClients.push(sender)
+          setTimeout(function () {
+            conn.syncingClients = conn.syncingClients.filter(function (cli) {
+              return cli !== sender
+            })
+            conn.send(sender, {
+              type: 'sync done'
+            })
+          }, conn.syncingClientDuration)
+        } else {
+          conn.send(sender, {
+            type: 'sync done'
+          })
+        }
+        conn._setSyncedWith(sender)
+      })
+    } else if (m.type === 'sync step 2') {
+      let conn = this
+      var broadcastHB = !this.broadcastedHB
+      this.broadcastedHB = true
+      var db = this.y.db
+      this.syncStep2 = new Promise(function (resolve) {
+        db.requestTransaction(function * () {
+          yield* this.applyDeleteSet(m.deleteSet)
+          this.store.apply(m.os)
+          db.requestTransaction(function * () {
+            var ops = yield* this.getOperations(m.stateSet)
+            if (ops.length > 0) {
+              m = {
+                type: 'update',
+                ops: ops
+              }
+              if (!broadcastHB) { // TODO: consider to broadcast here..
+                conn.send(sender, m)
+              } else {
+                // broadcast only once!
+                conn.broadcast(m)
+              }
+            }
+            resolve()
+          })
+        })
+      })
+    } else if (m.type === 'sync done') {
+      var self = this
+      this.syncStep2.then(function () {
+        self._setSyncedWith(sender)
+      })
+    } else if (m.type === 'update') {
+      if (this.forwardToSyncingClients) {
+        for (var client of this.syncingClients) {
+          this.send(client, m)
+        }
+      }
+      this.y.db.apply(m.ops)
+    }
+  }
+  _setSyncedWith (user) {
+    var conn = this.connections[user]
+    if (conn != null) {
+      conn.isSynced = true
+    }
+    if (user === this.currentSyncTarget) {
+      this.currentSyncTarget = null
+      this.findNextSyncTarget()
+    }
+  }
+  /*
+    Currently, the HB encodes operations as JSON. For the moment I want to keep it
+    that way. Maybe we support encoding in the HB as XML in the future, but for now I don't want
+    too much overhead. Y is very likely to get changed a lot in the future
+
+    Because we don't want to encode JSON as string (with character escaping, wich makes it pretty much unreadable)
+    we encode the JSON as XML.
+
+    When the HB support encoding as XML, the format should look pretty much like this.
+
+    does not support primitive values as array elements
+    expects an ltx (less than xml) object
+  */
+  parseMessageFromXml (m) {
+    function parseArray (node) {
+      for (var n of node.children) {
+        if (n.getAttribute('isArray') === 'true') {
+          return parseArray(n)
+        } else {
+          return parseObject(n)
+        }
+      }
+    }
+    function parseObject (node) {
+      var json = {}
+      for (var attrName in node.attrs) {
+        var value = node.attrs[attrName]
+        var int = parseInt(value, 10)
+        if (isNaN(int) || ('' + int) !== value) {
+          json[attrName] = value
+        } else {
+          json[attrName] = int
+        }
+      }
+      for (var n in node.children) {
+        var name = n.name
+        if (n.getAttribute('isArray') === 'true') {
+          json[name] = parseArray(n)
+        } else {
+          json[name] = parseObject(n)
+        }
+      }
+      return json
+    }
+    parseObject(m)
+  }
+  /*
+    encode message in xml
+    we use string because Strophe only accepts an "xml-string"..
+    So {a:4,b:{c:5}} will look like
+    <y a="4">
+      <b c="5"></b>
+    </y>
+    m - ltx element
+    json - Object
+  */
+  encodeMessageToXml (msg, obj) {
+    // attributes is optional
+    function encodeObject (m, json) {
+      for (var name in json) {
+        var value = json[name]
+        if (name == null) {
+          // nop
+        } else if (value.constructor === Object) {
+          encodeObject(m.c(name), value)
+        } else if (value.constructor === Array) {
+          encodeArray(m.c(name), value)
+        } else {
+          m.setAttribute(name, value)
+        }
+      }
+    }
+    function encodeArray (m, array) {
+      m.setAttribute('isArray', 'true')
+      for (var e of array) {
+        if (e.constructor === Object) {
+          encodeObject(m.c('array-element'), e)
+        } else {
+          encodeArray(m.c('array-element'), e)
+        }
+      }
+    }
+    if (obj.constructor === Object) {
+      encodeObject(msg.c('y', { xmlns: 'http://y.ninja/connector-stanza' }), obj)
+    } else if (obj.constructor === Array) {
+      encodeArray(msg.c('y', { xmlns: 'http://y.ninja/connector-stanza' }), obj)
+    } else {
+      throw new Error("I can't encode this json!")
+    }
+  }
+}
+Y.AbstractConnector = AbstractConnector
--- a/src/Connectors/Test.js
+++ b/src/Connectors/Test.js
@@ -0,0 +1,136 @@
+/* global getRandom, Y, wait, async */
+'use strict'
+
+var globalRoom = {
+  users: {},
+  buffers: {},
+  removeUser: function (user) {
+    for (var i in this.users) {
+      this.users[i].userLeft(user)
+    }
+    delete this.users[user]
+    delete this.buffers[user]
+  },
+  addUser: function (connector) {
+    this.users[connector.userId] = connector
+    this.buffers[connector.userId] = []
+    for (var uname in this.users) {
+      if (uname !== connector.userId) {
+        var u = this.users[uname]
+        u.userJoined(connector.userId, 'master')
+        connector.userJoined(u.userId, 'master')
+      }
+    }
+  }
+}
+Y.utils.globalRoom = globalRoom
+
+function flushOne () {
+  var bufs = []
+  for (var i in globalRoom.buffers) {
+    if (globalRoom.buffers[i].length > 0) {
+      bufs.push(i)
+    }
+  }
+  if (bufs.length > 0) {
+    var userId = getRandom(bufs)
+    var m = globalRoom.buffers[userId].shift()
+    var user = globalRoom.users[userId]
+    user.receiveMessage(m[0], m[1])
+    return true
+  } else {
+    return false
+  }
+}
+
+// setInterval(flushOne, 10)
+
+var userIdCounter = 0
+
+class Test extends Y.AbstractConnector {
+  constructor (y, options) {
+    if (options === undefined) {
+      throw new Error('Options must not be undefined!')
+    }
+    options.role = 'master'
+    options.forwardToSyncingClients = false
+    super(y, options)
+    this.setUserId((userIdCounter++) + '').then(() => {
+      globalRoom.addUser(this)
+    })
+    this.globalRoom = globalRoom
+    this.syncingClientDuration = 0
+  }
+  receiveMessage (sender, m) {
+    super.receiveMessage(sender, JSON.parse(JSON.stringify(m)))
+  }
+  send (userId, message) {
+    var buffer = globalRoom.buffers[userId]
+    if (buffer != null) {
+      buffer.push(JSON.parse(JSON.stringify([this.userId, message])))
+    }
+  }
+  broadcast (message) {
+    for (var key in globalRoom.buffers) {
+      globalRoom.buffers[key].push(JSON.parse(JSON.stringify([this.userId, message])))
+    }
+  }
+  isDisconnected () {
+    return globalRoom.users[this.userId] == null
+  }
+  reconnect () {
+    if (this.isDisconnected()) {
+      globalRoom.addUser(this)
+      super.reconnect()
+    }
+    return this.flushAll()
+  }
+  disconnect () {
+    if (!this.isDisconnected()) {
+      globalRoom.removeUser(this.userId)
+      super.disconnect()
+    }
+    return wait()
+  }
+  flush () {
+    var self = this
+    return async(function * () {
+      yield wait()
+      while (globalRoom.buffers[self.userId].length > 0) {
+        var m = globalRoom.buffers[self.userId].shift()
+        this.receiveMessage(m[0], m[1])
+        yield wait()
+      }
+    })
+  }
+  flushAll () {
+    return new Promise(function (resolve) {
+      // flushes may result in more created operations,
+      // flush until there is nothing more to flush
+      function nextFlush () {
+        var c = flushOne()
+        if (c) {
+          while (flushOne()) {
+            // nop
+          }
+          wait().then(nextFlush)
+        } else {
+          wait().then(function () {
+            resolve()
+          })
+        }
+      }
+      // in the case that there are
+      // still actions that want to be performed
+      wait().then(nextFlush)
+    })
+  }
+  /*
+    Flushes an operation for some user..
+  */
+  flushOne () {
+    flushOne()
+  }
+}
+
+Y.Test = Test
--- a/src/Connectors/WebRTC.js
+++ b/src/Connectors/WebRTC.js
@@ -0,0 +1,94 @@
+/* global Y, SimpleWebRTC */
+'use strict'
+
+class WebRTC extends Y.AbstractConnector {
+  constructor (y, options) {
+    if (options === undefined) {
+      throw new Error('Options must not be undefined!')
+    }
+    if (options.room == null) {
+      throw new Error('You must define a room name!')
+    }
+    options.role = 'slave'
+    super(y, options)
+    this.webrtcOptions = {
+      url: options.url || 'https://yatta.ninja:8888',
+      room: options.room
+    }
+    var swr = new SimpleWebRTC(this.webrtcOptions)
+    this.swr = swr
+    var self = this
+    swr.once('connectionReady', function (userId) {
+      // SimpleWebRTC (swr) is initialized
+      swr.joinRoom(self.webrtcOptions.room)
+
+      swr.once('joinedRoom', function () {
+        self.setUserId(userId)
+        /*
+        var i
+        // notify the connector class about all the users that already
+        // joined the session
+        for(i in self.swr.webrtc.peers){
+          self.userJoined(self.swr.webrtc.peers[i].id, "master")
+        }*/
+        swr.on('channelMessage', function (peer, room_, message) {
+          // The client received a message
+          // Check if the connector is already initialized,
+          // only then forward the message to the connector class
+          if (message.type != null) {
+            self.receiveMessage(peer.id, message.payload)
+          }
+        })
+      })
+
+      swr.on('createdPeer', function (peer) {
+        // a new peer/client joined the session.
+        // Notify the connector class, if the connector
+        // is already initialized
+        self.userJoined(peer.id, 'master')
+      })
+
+      swr.on('peerStreamRemoved', function (peer) {
+        // a client left the session.
+        // Notify the connector class, if the connector
+        // is already initialized
+        self.userLeft(peer.id)
+      })
+    })
+  }
+  disconnect () {
+    this.swr.leaveRoom()
+    super.disconnect()
+  }
+  reconnect () {
+    this.swr.joinRoom(this.webrtcOptions.room)
+    super.reconnect()
+  }
+  send (uid, message) {
+    var self = this
+    // we have to make sure that the message is sent under all circumstances
+    var send = function () {
+      // check if the clients still exists
+      var peer = self.swr.webrtc.getPeers(uid)[0]
+      var success
+      if (peer) {
+        // success is true, if the message is successfully sent
+        success = peer.sendDirectly('simplewebrtc', 'yjs', message)
+      }
+      if (!success) {
+        // resend the message if it didn't work
+        setTimeout(send, 500)
+      }
+    }
+    // try to send the message
+    send()
+  }
+  broadcast (message) {
+    this.swr.sendDirectlyToAll('simplewebrtc', 'yjs', message)
+  }
+  isDisconnected () {
+    return false
+  }
+}
+
+Y.WebRTC = WebRTC
--- a/src/Database.js
+++ b/src/Database.js
@@ -0,0 +1,341 @@
+/* global Y */
+'use strict'
+
+/*
+  Partial definition of an OperationStore.
+  TODO: name it Database, operation store only holds operations.
+
+  A database definition must alse define the following methods:
+  * logTable() (optional)
+    - show relevant information information in a table
+  * requestTransaction(makeGen)
+    - request a transaction
+  * destroy()
+    - destroy the database
+*/
+class AbstractDatabase {
+  constructor (y, opts) {
+    this.y = y
+    // E.g. this.listenersById[id] : Array<Listener>
+    this.listenersById = {}
+    // Execute the next time a transaction is requested
+    this.listenersByIdExecuteNow = []
+    // A transaction is requested
+    this.listenersByIdRequestPending = false
+    /* To make things more clear, the following naming conventions:
+       * ls : we put this.listenersById on ls
+       * l : Array<Listener>
+       * id : Id (can't use as property name)
+       * sid : String (converted from id via JSON.stringify
+                       so we can use it as a property name)
+
+      Always remember to first overwrite
+      a property before you iterate over it!
+    */
+    // TODO: Use ES7 Weak Maps. This way types that are no longer user,
+    // wont be kept in memory.
+    this.initializedTypes = {}
+    this.whenUserIdSetListener = null
+    this.waitingTransactions = []
+    this.transactionInProgress = false
+    if (typeof YConcurrency_TestingMode !== 'undefined') {
+      this.executeOrder = []
+    }
+    this.gc1 = [] // first stage
+    this.gc2 = [] // second stage -> after that, remove the op
+    this.gcTimeout = opts.gcTimeout || 5000
+    var os = this
+    function garbageCollect () {
+      return new Promise((resolve) => {
+        os.requestTransaction(function * () {
+          if (os.y.connector != null && os.y.connector.isSynced) {
+            for (var i in os.gc2) {
+              var oid = os.gc2[i]
+              yield* this.garbageCollectOperation(oid)
+            }
+            os.gc2 = os.gc1
+            os.gc1 = []
+          }
+          if (os.gcTimeout > 0) {
+            os.gcInterval = setTimeout(garbageCollect, os.gcTimeout)
+          }
+          resolve()
+        })
+      })
+    }
+    this.garbageCollect = garbageCollect
+    if (this.gcTimeout > 0) {
+      garbageCollect()
+    }
+  }
+  addToDebug () {
+    if (typeof YConcurrency_TestingMode !== 'undefined') {
+      var command = Array.prototype.map.call(arguments, function (s) {
+        if (typeof s === 'string') {
+          return s
+        } else {
+          return JSON.stringify(s)
+        }
+      }).join('').replace(/"/g, "'").replace(/,/g, ', ').replace(/:/g, ': ')
+      this.executeOrder.push(command)
+    }
+  }
+  getDebugData () {
+    console.log(this.executeOrder.join('\n'))
+  }
+  stopGarbageCollector () {
+    var self = this
+    return new Promise(function (resolve) {
+      self.requestTransaction(function * () {
+        var ungc = self.gc1.concat(self.gc2)
+        self.gc1 = []
+        self.gc2 = []
+        for (var i in ungc) {
+          var op = yield* this.getOperation(ungc[i])
+          delete op.gc
+          yield* this.setOperation(op)
+        }
+        resolve()
+      })
+    })
+  }
+  /*
+    Try to add to GC.
+
+    TODO: rename this function
+
+    Rulez:
+    * Only gc if this user is online
+    * The most left element in a list must not be gc'd.
+      => There is at least one element in the list
+
+    returns true iff op was added to GC
+  */
+  addToGarbageCollector (op, left) {
+    if (
+      op.gc == null &&
+      op.deleted === true &&
+      this.y.connector.isSynced &&
+      left != null &&
+      left.deleted === true
+    ) {
+      op.gc = true
+      this.gc1.push(op.id)
+      return true
+    } else {
+      return false
+    }
+  }
+  removeFromGarbageCollector (op) {
+    function filter (o) {
+      return !Y.utils.compareIds(o, op.id)
+    }
+    this.gc1 = this.gc1.filter(filter)
+    this.gc2 = this.gc2.filter(filter)
+    delete op.gc
+  }
+  destroy () {
+    clearInterval(this.gcInterval)
+    this.gcInterval = null
+  }
+  setUserId (userId) {
+    var self = this
+    return new Promise(function (resolve) {
+      self.requestTransaction(function * () {
+        self.userId = userId
+        self.opClock = (yield* this.getState(userId)).clock
+        if (self.whenUserIdSetListener != null) {
+          self.whenUserIdSetListener()
+          self.whenUserIdSetListener = null
+        }
+        resolve()
+      })
+    })
+  }
+  whenUserIdSet (f) {
+    if (this.userId != null) {
+      f()
+    } else {
+      this.whenUserIdSetListener = f
+    }
+  }
+  getNextOpId () {
+    if (this.userId == null) {
+      throw new Error('OperationStore not yet initialized!')
+    }
+    return [this.userId, this.opClock++]
+  }
+  /*
+    Apply a list of operations.
+
+    * get a transaction
+    * check whether all Struct.*.requiredOps are in the OS
+    * check if it is an expected op (otherwise wait for it)
+    * check if was deleted, apply a delete operation after op was applied
+  */
+  apply (ops) {
+    for (var key in ops) {
+      var o = ops[key]
+      var required = Y.Struct[o.struct].requiredOps(o)
+      this.whenOperationsExist(required, o)
+    }
+  }
+  /*
+    op is executed as soon as every operation requested is available.
+    Note that Transaction can (and should) buffer requests.
+  */
+  whenOperationsExist (ids, op) {
+    if (ids.length > 0) {
+      let listener = {
+        op: op,
+        missing: ids.length
+      }
+
+      for (let key in ids) {
+        let id = ids[key]
+        let sid = JSON.stringify(id)
+        let l = this.listenersById[sid]
+        if (l == null) {
+          l = []
+          this.listenersById[sid] = l
+        }
+        l.push(listener)
+      }
+    } else {
+      this.listenersByIdExecuteNow.push({
+        op: op
+      })
+    }
+
+    if (this.listenersByIdRequestPending) {
+      return
+    }
+
+    this.listenersByIdRequestPending = true
+    var store = this
+
+    this.requestTransaction(function * () {
+      var exeNow = store.listenersByIdExecuteNow
+      store.listenersByIdExecuteNow = []
+
+      var ls = store.listenersById
+      store.listenersById = {}
+
+      store.listenersByIdRequestPending = false
+
+      for (let key in exeNow) {
+        let o = exeNow[key].op
+        yield* store.tryExecute.call(this, o)
+      }
+
+      for (var sid in ls) {
+        var l = ls[sid]
+        var id = JSON.parse(sid)
+        if ((yield* this.getOperation(id)) == null) {
+          store.listenersById[sid] = l
+        } else {
+          for (let key in l) {
+            let listener = l[key]
+            let o = listener.op
+            if (--listener.missing === 0) {
+              yield* store.tryExecute.call(this, o)
+            }
+          }
+        }
+      }
+    })
+  }
+  /*
+    Actually execute an operation, when all expected operations are available.
+  */
+  * tryExecute (op) {
+    this.store.addToDebug('yield* this.store.tryExecute.call(this, ', JSON.stringify(op), ')')
+    if (op.struct === 'Delete') {
+      yield* Y.Struct.Delete.execute.call(this, op)
+      yield* this.store.operationAdded(this, op)
+    } else if ((yield* this.getOperation(op.id)) == null && !(yield* this.isGarbageCollected(op.id))) {
+      yield* Y.Struct[op.struct].execute.call(this, op)
+      yield* this.addOperation(op)
+      yield* this.store.operationAdded(this, op)
+    }
+  }
+  // called by a transaction when an operation is added
+  * operationAdded (transaction, op) {
+    if (op.struct === 'Delete') {
+      var target = yield* transaction.getOperation(op.target)
+      if (target != null) {
+        var type = transaction.store.initializedTypes[JSON.stringify(target.parent)]
+        if (type != null) {
+          yield* type._changed(transaction, {
+            struct: 'Delete',
+            target: op.target
+          })
+        }
+      }
+    } else {
+      // increase SS
+      var o = op
+      var state = yield* transaction.getState(op.id[0])
+      while (o != null && o.id[1] === state.clock && op.id[0] === o.id[0]) {
+        // either its a new operation (1. case), or it is an operation that was deleted, but is not yet in the OS
+        state.clock++
+        yield* transaction.checkDeleteStoreForState(state)
+        o = yield* transaction.os.findNext(o.id)
+      }
+      yield* transaction.setState(state)
+
+      // notify whenOperation listeners (by id)
+      var sid = JSON.stringify(op.id)
+      var l = this.listenersById[sid]
+      delete this.listenersById[sid]
+
+      if (l != null) {
+        for (var key in l) {
+          var listener = l[key]
+          if (--listener.missing === 0) {
+            this.whenOperationsExist([], listener.op)
+          }
+        }
+      }
+      var t = this.initializedTypes[JSON.stringify(op.parent)]
+      // notify parent, if it has been initialized as a custom type
+      if (t != null) {
+        yield* t._changed(transaction, Y.utils.copyObject(op))
+      }
+
+      // Delete if DS says this is actually deleted
+      if (!op.deleted && (yield* transaction.isDeleted(op.id))) {
+        var delop = {
+          struct: 'Delete',
+          target: op.id
+        }
+        yield* Y.Struct['Delete'].execute.call(transaction, delop)
+        if (t != null) {
+          yield* t._changed(transaction, delop)
+        }
+      }
+    }
+  }
+  getNextRequest () {
+    if (this.waitingTransactions.length === 0) {
+      this.transactionInProgress = false
+      return null
+    } else {
+      return this.waitingTransactions.shift()
+    }
+  }
+  requestTransaction (makeGen, callImmediately) {
+    if (callImmediately) {
+      this.transact(makeGen)
+    } else if (!this.transactionInProgress) {
+      this.transactionInProgress = true
+      var self = this
+      setTimeout(function () {
+        self.transact(makeGen)
+      }, 0)
+    } else {
+      this.waitingTransactions.push(makeGen)
+    }
+  }
+}
+Y.AbstractDatabase = AbstractDatabase
--- a/src/Database.spec.js
+++ b/src/Database.spec.js
@@ -0,0 +1,351 @@
+/* global Y, async, databases */
+/* eslint-env browser,jasmine,console */
+
+for (let database of databases) {
+  describe(`Database (${database})`, function () {
+    var store
+    describe('DeleteStore', function () {
+      describe('Basic', function () {
+        beforeEach(function () {
+          store = new Y[database](null, {
+            gcTimeout: -1,
+            namespace: 'testing'
+          })
+        })
+        afterEach(function (done) {
+          store.requestTransaction(function * () {
+            yield* this.store.destroy()
+            done()
+          })
+        })
+        it('Deleted operation is deleted', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['u1', 10])
+            expect(yield* this.isDeleted(['u1', 10])).toBeTruthy()
+            expect(yield* this.getDeleteSet()).toEqual({'u1': [[10, 1, false]]})
+            done()
+          })
+        }))
+        it('Deleted operation extends other deleted operation', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['u1', 10])
+            yield* this.markDeleted(['u1', 11])
+            expect(yield* this.isDeleted(['u1', 10])).toBeTruthy()
+            expect(yield* this.isDeleted(['u1', 11])).toBeTruthy()
+            expect(yield* this.getDeleteSet()).toEqual({'u1': [[10, 2, false]]})
+            done()
+          })
+        }))
+        it('Deleted operation extends other deleted operation', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['0', 3])
+            yield* this.markDeleted(['0', 4])
+            yield* this.markDeleted(['0', 2])
+            expect(yield* this.getDeleteSet()).toEqual({'0': [[2, 3, false]]})
+            done()
+          })
+        }))
+        it('Debug #1', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['166', 0])
+            yield* this.markDeleted(['166', 2])
+            yield* this.markDeleted(['166', 0])
+            yield* this.markDeleted(['166', 2])
+            yield* this.markGarbageCollected(['166', 2])
+            yield* this.markDeleted(['166', 1])
+            yield* this.markDeleted(['166', 3])
+            yield* this.markGarbageCollected(['166', 3])
+            yield* this.markDeleted(['166', 0])
+            expect(yield* this.getDeleteSet()).toEqual({'166': [[0, 2, false], [2, 2, true]]})
+            done()
+          })
+        }))
+        it('Debug #2', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['293', 0])
+            yield* this.markDeleted(['291', 2])
+            yield* this.markDeleted(['291', 2])
+            yield* this.markGarbageCollected(['293', 0])
+            yield* this.markDeleted(['293', 1])
+            yield* this.markGarbageCollected(['291', 2])
+            expect(yield* this.getDeleteSet()).toEqual({'291': [[2, 1, true]], '293': [[0, 1, true], [1, 1, false]]})
+            done()
+          })
+        }))
+        it('Debug #3', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['581', 0])
+            yield* this.markDeleted(['581', 1])
+            yield* this.markDeleted(['580', 0])
+            yield* this.markDeleted(['580', 0])
+            yield* this.markGarbageCollected(['581', 0])
+            yield* this.markDeleted(['581', 2])
+            yield* this.markDeleted(['580', 1])
+            yield* this.markDeleted(['580', 2])
+            yield* this.markDeleted(['580', 1])
+            yield* this.markDeleted(['580', 2])
+            yield* this.markGarbageCollected(['581', 2])
+            yield* this.markGarbageCollected(['581', 1])
+            yield* this.markGarbageCollected(['580', 1])
+            expect(yield* this.getDeleteSet()).toEqual({'580': [[0, 1, false], [1, 1, true], [2, 1, false]], '581': [[0, 3, true]]})
+            done()
+          })
+        }))
+        it('Debug #4', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['544', 0])
+            yield* this.markDeleted(['543', 2])
+            yield* this.markDeleted(['544', 0])
+            yield* this.markDeleted(['543', 2])
+            yield* this.markGarbageCollected(['544', 0])
+            yield* this.markDeleted(['545', 1])
+            yield* this.markDeleted(['543', 4])
+            yield* this.markDeleted(['543', 3])
+            yield* this.markDeleted(['544', 1])
+            yield* this.markDeleted(['544', 2])
+            yield* this.markDeleted(['544', 1])
+            yield* this.markDeleted(['544', 2])
+            yield* this.markGarbageCollected(['543', 2])
+            yield* this.markGarbageCollected(['543', 4])
+            yield* this.markGarbageCollected(['544', 2])
+            yield* this.markGarbageCollected(['543', 3])
+            expect(yield* this.getDeleteSet()).toEqual({'543': [[2, 3, true]], '544': [[0, 1, true], [1, 1, false], [2, 1, true]], '545': [[1, 1, false]]})
+            done()
+          })
+        }))
+        it('Debug #5', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.applyDeleteSet({'16': [[1, 2, false]], '17': [[0, 1, true], [1, 3, false]]})
+            expect(yield* this.getDeleteSet()).toEqual({'16': [[1, 2, false]], '17': [[0, 1, true], [1, 3, false]]})
+            yield* this.applyDeleteSet({'16': [[1, 2, false]], '17': [[0, 4, true]]})
+            expect(yield* this.getDeleteSet()).toEqual({'16': [[1, 2, false]], '17': [[0, 4, true]]})
+            done()
+          })
+        }))
+        it('Debug #6', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.applyDeleteSet({'40': [[0, 3, false]]})
+            expect(yield* this.getDeleteSet()).toEqual({'40': [[0, 3, false]]})
+            yield* this.applyDeleteSet({'39': [[2, 2, false]], '40': [[0, 1, true], [1, 2, false]], '41': [[2, 1, false]]})
+            expect(yield* this.getDeleteSet()).toEqual({'39': [[2, 2, false]], '40': [[0, 1, true], [1, 2, false]], '41': [[2, 1, false]]})
+            done()
+          })
+        }))
+        it('Debug #7', async(function * (done) {
+          store.requestTransaction(function * () {
+            yield* this.markDeleted(['9', 2])
+            yield* this.markDeleted(['11', 2])
+            yield* this.markDeleted(['11', 4])
+            yield* this.markDeleted(['11', 1])
+            yield* this.markDeleted(['9', 4])
+            yield* this.markDeleted(['10', 0])
+            yield* this.markGarbageCollected(['11', 2])
+            yield* this.markDeleted(['11', 2])
+            yield* this.markGarbageCollected(['11', 3])
+            yield* this.markDeleted(['11', 3])
+            yield* this.markDeleted(['11', 3])
+            yield* this.markDeleted(['9', 4])
+            yield* this.markDeleted(['10', 0])
+            yield* this.markGarbageCollected(['11', 1])
+            yield* this.markDeleted(['11', 1])
+            expect(yield* this.getDeleteSet()).toEqual({'9': [[2, 1, false], [4, 1, false]], '10': [[0, 1, false]], '11': [[1, 3, true], [4, 1, false]]})
+            done()
+          })
+        }))
+      })
+    })
+    describe('OperationStore', function () {
+      describe('Basic Tests', function () {
+        beforeEach(function () {
+          store = new Y[database](null, {
+            gcTimeout: -1,
+            namespace: 'testing'
+          })
+        })
+        afterEach(function (done) {
+          store.requestTransaction(function * () {
+            yield* this.store.destroy()
+            done()
+          })
+        })
+        it('debug #1', function (done) {
+          store.requestTransaction(function * () {
+            yield* this.os.put({id: [2]})
+            yield* this.os.put({id: [0]})
+            yield* this.os.delete([2])
+            yield* this.os.put({id: [1]})
+            expect(yield* this.os.find([0])).toBeTruthy()
+            expect(yield* this.os.find([1])).toBeTruthy()
+            expect(yield* this.os.find([2])).toBeFalsy()
+            done()
+          })
+        })
+        it('can add&retrieve 5 elements', function (done) {
+          store.requestTransaction(function * () {
+            yield* this.os.put({val: 'four', id: [4]})
+            yield* this.os.put({val: 'one', id: [1]})
+            yield* this.os.put({val: 'three', id: [3]})
+            yield* this.os.put({val: 'two', id: [2]})
+            yield* this.os.put({val: 'five', id: [5]})
+            expect((yield* this.os.find([1])).val).toEqual('one')
+            expect((yield* this.os.find([2])).val).toEqual('two')
+            expect((yield* this.os.find([3])).val).toEqual('three')
+            expect((yield* this.os.find([4])).val).toEqual('four')
+            expect((yield* this.os.find([5])).val).toEqual('five')
+            done()
+          })
+        })
+        it('5 elements do not exist anymore after deleting them', function (done) {
+          store.requestTransaction(function * () {
+            yield* this.os.put({val: 'four', id: [4]})
+            yield* this.os.put({val: 'one', id: [1]})
+            yield* this.os.put({val: 'three', id: [3]})
+            yield* this.os.put({val: 'two', id: [2]})
+            yield* this.os.put({val: 'five', id: [5]})
+            yield* this.os.delete([4])
+            expect(yield* this.os.find([4])).not.toBeTruthy()
+            yield* this.os.delete([3])
+            expect(yield* this.os.find([3])).not.toBeTruthy()
+            yield* this.os.delete([2])
+            expect(yield* this.os.find([2])).not.toBeTruthy()
+            yield* this.os.delete([1])
+            expect(yield* this.os.find([1])).not.toBeTruthy()
+            yield* this.os.delete([5])
+            expect(yield* this.os.find([5])).not.toBeTruthy()
+            done()
+          })
+        })
+      })
+      var numberOfOSTests = 1000
+      describe(`Random Tests - after adding&deleting (0.8/0.2) ${numberOfOSTests} times`, function () {
+        var elements = []
+        beforeAll(function (done) {
+          store = new Y[database](null, {
+            gcTimeout: -1,
+            namespace: 'testing'
+          })
+          store.requestTransaction(function * () {
+            for (var i = 0; i < numberOfOSTests; i++) {
+              var r = Math.random()
+              if (r < 0.8) {
+                var obj = [Math.floor(Math.random() * numberOfOSTests * 10000)]
+                if (!(yield* this.os.find(obj))) {
+                  elements.push(obj)
+                  yield* this.os.put({id: obj})
+                }
+              } else if (elements.length > 0) {
+                var elemid = Math.floor(Math.random() * elements.length)
+                var elem = elements[elemid]
+                elements = elements.filter(function (e) {
+                  return !Y.utils.compareIds(e, elem)
+                })
+                yield* this.os.delete(elem)
+              }
+            }
+            done()
+          })
+        })
+        afterAll(function (done) {
+          store.requestTransaction(function * () {
+            yield* this.store.destroy()
+            done()
+          })
+        })
+        it('can find every object', function (done) {
+          store.requestTransaction(function * () {
+            for (var id of elements) {
+              expect((yield* this.os.find(id)).id).toEqual(id)
+            }
+            done()
+          })
+        })
+
+        it('can find every object with lower bound search', function (done) {
+          store.requestTransaction(function * () {
+            for (var id of elements) {
+              var e = yield* this.os.findWithLowerBound(id)
+              expect(e.id).toEqual(id)
+            }
+            done()
+          })
+        })
+
+        it('iterating over a tree with lower bound yields the right amount of results', function (done) {
+          var lowerBound = elements[Math.floor(Math.random() * elements.length)]
+          var expectedResults = elements.filter(function (e, pos) {
+            return (Y.utils.smaller(lowerBound, e) || Y.utils.compareIds(e, lowerBound)) && elements.indexOf(e) === pos
+          }).length
+
+          var actualResults = 0
+          store.requestTransaction(function * () {
+            yield* this.os.iterate(this, lowerBound, null, function * (val) {
+              expect(val).toBeDefined()
+              actualResults++
+            })
+            expect(expectedResults).toEqual(actualResults)
+            done()
+          })
+        })
+
+        it('iterating over a tree without bounds yield the right amount of results', function (done) {
+          var lowerBound = null
+          var expectedResults = elements.filter(function (e, pos) {
+            return elements.indexOf(e) === pos
+          }).length
+          var actualResults = 0
+          store.requestTransaction(function * () {
+            yield* this.os.iterate(this, lowerBound, null, function * (val) {
+              expect(val).toBeDefined()
+              actualResults++
+            })
+            expect(expectedResults).toEqual(actualResults)
+            done()
+          })
+        })
+
+        it('iterating over a tree with upper bound yields the right amount of results', function (done) {
+          var upperBound = elements[Math.floor(Math.random() * elements.length)]
+          var expectedResults = elements.filter(function (e, pos) {
+            return (Y.utils.smaller(e, upperBound) || Y.utils.compareIds(e, upperBound)) && elements.indexOf(e) === pos
+          }).length
+
+          var actualResults = 0
+          store.requestTransaction(function * () {
+            yield* this.os.iterate(this, null, upperBound, function * (val) {
+              expect(val).toBeDefined()
+              actualResults++
+            })
+            expect(expectedResults).toEqual(actualResults)
+            done()
+          })
+        })
+
+        it('iterating over a tree with upper and lower bounds yield the right amount of results', function (done) {
+          var b1 = elements[Math.floor(Math.random() * elements.length)]
+          var b2 = elements[Math.floor(Math.random() * elements.length)]
+          var upperBound, lowerBound
+          if (Y.utils.smaller(b1, b2)) {
+            lowerBound = b1
+            upperBound = b2
+          } else {
+            lowerBound = b2
+            upperBound = b1
+          }
+          var expectedResults = elements.filter(function (e, pos) {
+            return (Y.utils.smaller(lowerBound, e) || Y.utils.compareIds(e, lowerBound)) &&
+              (Y.utils.smaller(e, upperBound) || Y.utils.compareIds(e, upperBound)) && elements.indexOf(e) === pos
+          }).length
+          var actualResults = 0
+          store.requestTransaction(function * () {
+            yield* this.os.iterate(this, lowerBound, upperBound, function * (val) {
+              expect(val).toBeDefined()
+              actualResults++
+            })
+            expect(expectedResults).toEqual(actualResults)
+            done()
+          })
+        })
+      })
+    })
+  })
+}
--- a/src/Databases/IndexedDB.js
+++ b/src/Databases/IndexedDB.js
@@ -0,0 +1,181 @@
+/* global Y */
+
+'use strict'
+
+Y.IndexedDB = (function () {
+  class Store {
+    constructor (transaction, name) {
+      this.store = transaction.objectStore(name)
+    }
+    * find (id) {
+      return yield this.store.get(id)
+    }
+    * put (v) {
+      yield this.store.put(v)
+    }
+    * delete (id) {
+      yield this.store.delete(id)
+    }
+    * findWithLowerBound (start) {
+      return yield this.store.openCursor(window.IDBKeyRange.lowerBound(start))
+    }
+    * findWithUpperBound (end) {
+      return yield this.store.openCursor(window.IDBKeyRange.upperBound(end), 'prev')
+    }
+    * findNext (id) {
+      return yield* this.findWithLowerBound([id[0], id[1] + 1])
+    }
+    * findPrev (id) {
+      return yield* this.findWithUpperBound([id[0], id[1] - 1])
+    }
+    * iterate (t, start, end, gen) {
+      var range = null
+      if (start != null && end != null) {
+        range = window.IDBKeyRange.bound(start, end)
+      } else if (start != null) {
+        range = window.IDBKeyRange.lowerBound(start)
+      } else if (end != null) {
+        range = window.IDBKeyRange.upperBound(end)
+      }
+      var cursorResult = this.store.openCursor(range)
+      while ((yield cursorResult) != null) {
+        yield* gen.call(t, cursorResult.result.value)
+        cursorResult.result.continue()
+      }
+    }
+
+  }
+  class Transaction extends Y.Transaction {
+    constructor (store) {
+      super(store)
+      var transaction = store.db.transaction(['OperationStore', 'StateStore', 'DeleteStore'], 'readwrite')
+      this.store = store
+      this.ss = new Store(transaction, 'StateStore')
+      this.os = new Store(transaction, 'OperationStore')
+      this.ds = new Store(transaction, 'DeleteStore')
+    }
+  }
+  class OperationStore extends Y.AbstractDatabase {
+    constructor (y, opts) {
+      super(y, opts)
+      if (opts == null) {
+        opts = {}
+      }
+      if (opts.namespace == null || typeof opts.namespace !== 'string') {
+        throw new Error('IndexedDB: expect a string (opts.namespace)!')
+      } else {
+        this.namespace = opts.namespace
+      }
+      if (opts.idbVersion != null) {
+        this.idbVersion = opts.idbVersion
+      } else {
+        this.idbVersion = 5
+      }
+      var store = this
+      // initialize database!
+      this.requestTransaction(function * () {
+        store.db = yield window.indexedDB.open(opts.namespace, store.idbVersion)
+      })
+      if (opts.cleanStart) {
+        this.requestTransaction(function * () {
+          yield this.os.store.clear()
+          yield this.ds.store.clear()
+          yield this.ss.store.clear()
+        })
+      }
+      var operationsToAdd = []
+      window.addEventListener('storage', function (event) {
+        if (event.key === '__YJS__' + store.namespace) {
+          operationsToAdd.push(event.newValue)
+          if (operationsToAdd.length === 1) {
+            store.requestTransaction(function * () {
+              var add = operationsToAdd
+              operationsToAdd = []
+              for (var i in add) {
+                // don't call the localStorage event twice..
+                var op = JSON.parse(add[i])
+                if (op.struct !== 'Delete') {
+                  op = yield* this.getOperation(op.id)
+                }
+                yield* this.store.operationAdded(this, op, true)
+              }
+            })
+          }
+        }
+      }, false)
+    }
+    * operationAdded (transaction, op, noAdd) {
+      yield* super.operationAdded(transaction, op)
+      if (!noAdd) {
+        window.localStorage['__YJS__' + this.namespace] = JSON.stringify(op)
+      }
+    }
+    transact (makeGen) {
+      var transaction = this.db != null ? new Transaction(this) : null
+      var store = this
+
+      var gen = makeGen.call(transaction)
+      handleTransactions(gen.next())
+
+      function handleTransactions (result) {
+        var request = result.value
+        if (result.done) {
+          makeGen = store.getNextRequest()
+          if (makeGen != null) {
+            if (transaction == null && store.db != null) {
+              transaction = new Transaction(store)
+            }
+            gen = makeGen.call(transaction)
+            handleTransactions(gen.next())
+          } // else no transaction in progress!
+          return
+        }
+        if (request.constructor === window.IDBRequest) {
+          request.onsuccess = function () {
+            var res = request.result
+            if (res != null && res.constructor === window.IDBCursorWithValue) {
+              res = res.value
+            }
+            handleTransactions(gen.next(res))
+          }
+          request.onerror = function (err) {
+            gen.throw(err)
+          }
+        } else if (request.constructor === window.IDBCursor) {
+          request.onsuccess = function () {
+            handleTransactions(gen.next(request.result != null ? request.result.value : null))
+          }
+          request.onerror = function (err) {
+            gen.throw(err)
+          }
+        } else if (request.constructor === window.IDBOpenDBRequest) {
+          request.onsuccess = function (event) {
+            var db = event.target.result
+            handleTransactions(gen.next(db))
+          }
+          request.onerror = function () {
+            gen.throw("Couldn't open IndexedDB database!")
+          }
+          request.onupgradeneeded = function (event) {
+            var db = event.target.result
+            try {
+              db.createObjectStore('OperationStore', {keyPath: 'id'})
+              db.createObjectStore('DeleteStore', {keyPath: 'id'})
+              db.createObjectStore('StateStore', {keyPath: 'id'})
+            } catch (e) {
+              console.log('Store already exists!')
+            }
+          }
+        } else {
+          gen.throw('You must not yield this type!')
+        }
+      }
+    }
+    // TODO: implement "free"..
+    * destroy () {
+      this.db.close()
+      yield window.indexedDB.deleteDatabase(this.namespace)
+    }
+  }
+  return OperationStore
+})()
--- a/src/Databases/IndexedDB.spec.js
+++ b/src/Databases/IndexedDB.spec.js
@@ -0,0 +1,19 @@
+/* global Y */
+/* eslint-env browser,jasmine */
+
+if (typeof window !== 'undefined' && false) {
+  describe('IndexedDB', function () {
+    var ob
+    beforeAll(function () {
+      ob = new Y.IndexedDB(null, {namespace: 'Test', gcTimeout: -1})
+    })
+
+    afterAll(function (done) {
+      ob.requestTransaction(function *() {
+        yield* ob.removeDatabase()
+        ob = null
+        done()
+      })
+    })
+  })
+}
--- a/src/Databases/Memory.js
+++ b/src/Databases/Memory.js
@@ -0,0 +1,63 @@
+/* global Y */
+'use strict'
+
+Y.Memory = (function () {
+  class Transaction extends Y.Transaction {
+    constructor (store) {
+      super(store)
+      this.store = store
+      this.ss = store.ss
+      this.os = store.os
+      this.ds = store.ds
+    }
+  }
+  class Database extends Y.AbstractDatabase {
+    constructor (y, opts) {
+      super(y, opts)
+      this.os = new Y.utils.RBTree()
+      this.ds = new Y.utils.RBTree()
+      this.ss = new Y.utils.RBTree()
+    }
+    logTable () {
+      var self = this
+      self.requestTransaction(function * () {
+        console.log('User: ', this.store.y.connector.userId, "==============================") // eslint-disable-line
+        console.log("State Set (SS):", yield* this.getStateSet()) // eslint-disable-line
+        console.log("Operation Store (OS):") // eslint-disable-line
+        yield* this.os.logTable() // eslint-disable-line
+        console.log("Deletion Store (DS):") //eslint-disable-line
+        yield* this.ds.logTable() // eslint-disable-line
+        if (this.store.gc1.length > 0 || this.store.gc2.length > 0) {
+          console.warn('GC1|2 not empty!', this.store.gc1, this.store.gc2)
+        }
+        if (JSON.stringify(this.store.listenersById) !== '{}') {
+          console.warn('listenersById not empty!')
+        }
+        if (JSON.stringify(this.store.listenersByIdExecuteNow) !== '[]') {
+          console.warn('listenersByIdExecuteNow not empty!')
+        }
+        if (this.store.transactionInProgress) {
+          console.warn('Transaction still in progress!')
+        }
+      }, true)
+    }
+    transact (makeGen) {
+      var t = new Transaction(this)
+      while (makeGen !== null) {
+        var gen = makeGen.call(t)
+        var res = gen.next()
+        while (!res.done) {
+          res = gen.next(res.value)
+        }
+        makeGen = this.getNextRequest()
+      }
+    }
+    * destroy () {
+      super.destroy()
+      delete this.os
+      delete this.ss
+      delete this.ds
+    }
+  }
+  return Database
+})()
--- a/src/Databases/RedBlackTree.js
+++ b/src/Databases/RedBlackTree.js
@@ -0,0 +1,489 @@
+/* global Y */
+'use strict'
+
+/*
+  This file contains a not so fancy implemantion of a Red Black Tree.
+*/
+
+class N {
+  // A created node is always red!
+  constructor (val) {
+    this.val = val
+    this.color = true
+    this._left = null
+    this._right = null
+    this._parent = null
+    if (val.id === null) {
+      throw new Error('You must define id!')
+    }
+  }
+  isRed () { return this.color }
+  isBlack () { return !this.color }
+  redden () { this.color = true; return this }
+  blacken () { this.color = false; return this }
+  get grandparent () {
+    return this.parent.parent
+  }
+  get parent () {
+    return this._parent
+  }
+  get sibling () {
+    return (this === this.parent.left)
+      ? this.parent.right : this.parent.left
+  }
+  get left () {
+    return this._left
+  }
+  get right () {
+    return this._right
+  }
+  set left (n) {
+    if (n !== null) {
+      n._parent = this
+    }
+    this._left = n
+  }
+  set right (n) {
+    if (n !== null) {
+      n._parent = this
+    }
+    this._right = n
+  }
+  rotateLeft (tree) {
+    var parent = this.parent
+    var newParent = this.right
+    var newRight = this.right.left
+    newParent.left = this
+    this.right = newRight
+    if (parent === null) {
+      tree.root = newParent
+      newParent._parent = null
+    } else if (parent.left === this) {
+      parent.left = newParent
+    } else if (parent.right === this) {
+      parent.right = newParent
+    } else {
+      throw new Error('The elements are wrongly connected!')
+    }
+  }
+  next () {
+    if (this.right !== null) {
+      // search the most left node in the right tree
+      var o = this.right
+      while (o.left !== null) {
+        o = o.left
+      }
+      return o
+    } else {
+      var p = this
+      while (p.parent !== null && p !== p.parent.left) {
+        p = p.parent
+      }
+      return p.parent
+    }
+  }
+  prev () {
+    if (this.left !== null) {
+      // search the most right node in the left tree
+      var o = this.left
+      while (o.right !== null) {
+        o = o.right
+      }
+      return o
+    } else {
+      var p = this
+      while (p.parent !== null && p !== p.parent.right) {
+        p = p.parent
+      }
+      return p.parent
+    }
+  }
+  rotateRight (tree) {
+    var parent = this.parent
+    var newParent = this.left
+    var newLeft = this.left.right
+    newParent.right = this
+    this.left = newLeft
+    if (parent === null) {
+      tree.root = newParent
+      newParent._parent = null
+    } else if (parent.left === this) {
+      parent.left = newParent
+    } else if (parent.right === this) {
+      parent.right = newParent
+    } else {
+      throw new Error('The elements are wrongly connected!')
+    }
+  }
+  getUncle () {
+    // we can assume that grandparent exists when this is called!
+    if (this.parent === this.parent.parent.left) {
+      return this.parent.parent.right
+    } else {
+      return this.parent.parent.left
+    }
+  }
+}
+
+class RBTree {
+  constructor () {
+    this.root = null
+    this.length = 0
+  }
+  * findNext (id) {
+    return yield* this.findWithLowerBound([id[0], id[1] + 1])
+  }
+  * findPrev (id) {
+    return yield* this.findWithUpperBound([id[0], id[1] - 1])
+  }
+  findNodeWithLowerBound (from) {
+    if (from === void 0) {
+      throw new Error('You must define from!')
+    }
+    var o = this.root
+    if (o === null) {
+      return null
+    } else {
+      while (true) {
+        if ((from === null || Y.utils.smaller(from, o.val.id)) && o.left !== null) {
+          // o is included in the bound
+          // try to find an element that is closer to the bound
+          o = o.left
+        } else if (from !== null && Y.utils.smaller(o.val.id, from)) {
+          // o is not within the bound, maybe one of the right elements is..
+          if (o.right !== null) {
+            o = o.right
+          } else {
+            // there is no right element. Search for the next bigger element,
+            // this should be within the bounds
+            return o.next()
+          }
+        } else {
+          return o
+        }
+      }
+    }
+  }
+  findNodeWithUpperBound (to) {
+    if (to === void 0) {
+      throw new Error('You must define from!')
+    }
+    var o = this.root
+    if (o === null) {
+      return null
+    } else {
+      while (true) {
+        if ((to === null || Y.utils.smaller(o.val.id, to)) && o.right !== null) {
+          // o is included in the bound
+          // try to find an element that is closer to the bound
+          o = o.right
+        } else if (to !== null && Y.utils.smaller(to, o.val.id)) {
+          // o is not within the bound, maybe one of the left elements is..
+          if (o.left !== null) {
+            o = o.left
+          } else {
+            // there is no left element. Search for the prev smaller element,
+            // this should be within the bounds
+            return o.prev()
+          }
+        } else {
+          return o
+        }
+      }
+    }
+  }
+  * findWithLowerBound (from) {
+    var n = this.findNodeWithLowerBound(from)
+    return n == null ? null : n.val
+  }
+  * findWithUpperBound (to) {
+    var n = this.findNodeWithUpperBound(to)
+    return n == null ? null : n.val
+  }
+  * iterate (t, from, to, f) {
+    var o = this.findNodeWithLowerBound(from)
+    while (o !== null && (to === null || Y.utils.smaller(o.val.id, to) || Y.utils.compareIds(o.val.id, to))) {
+      yield* f.call(t, o.val)
+      o = o.next()
+    }
+    return true
+  }
+  * logTable (from, to, filter) {
+    if (filter == null) {
+      filter = function () {
+        return true
+      }
+    }
+    if (from == null) { from = null }
+    if (to == null) { to = null }
+    var os = []
+    yield* this.iterate(this, from, to, function * (o) {
+      if (filter(o)) {
+        var o_ = {}
+        for (var key in o) {
+          if (typeof o[key] === 'object') {
+            o_[key] = JSON.stringify(o[key])
+          } else {
+            o_[key] = o[key]
+          }
+        }
+        os.push(o_)
+      }
+    })
+    if (console.table != null) {
+      console.table(os)
+    }
+  }
+  * find (id) {
+    var n
+    return (n = this.findNode(id)) ? n.val : null
+  }
+  findNode (id) {
+    if (id == null || id.constructor !== Array) {
+      throw new Error('Expect id to be an array!')
+    }
+    var o = this.root
+    if (o === null) {
+      return false
+    } else {
+      while (true) {
+        if (o === null) {
+          return false
+        }
+        if (Y.utils.smaller(id, o.val.id)) {
+          o = o.left
+        } else if (Y.utils.smaller(o.val.id, id)) {
+          o = o.right
+        } else {
+          return o
+        }
+      }
+    }
+  }
+  * delete (id) {
+    if (id == null || id.constructor !== Array) {
+      throw new Error('id is expected to be an Array!')
+    }
+    var d = this.findNode(id)
+    if (d == null) {
+      throw new Error('Element does not exist!')
+    }
+    this.length--
+    if (d.left !== null && d.right !== null) {
+      // switch d with the greates element in the left subtree.
+      // o should have at most one child.
+      var o = d.left
+      // find
+      while (o.right !== null) {
+        o = o.right
+      }
+      // switch
+      d.val = o.val
+      d = o
+    }
+    // d has at most one child
+    // let n be the node that replaces d
+    var isFakeChild
+    var child = d.left || d.right
+    if (child === null) {
+      isFakeChild = true
+      child = new N({id: 0})
+      child.blacken()
+      d.right = child
+    } else {
+      isFakeChild = false
+    }
+
+    if (d.parent === null) {
+      if (!isFakeChild) {
+        this.root = child
+        child.blacken()
+        child._parent = null
+      } else {
+        this.root = null
+      }
+      return
+    } else if (d.parent.left === d) {
+      d.parent.left = child
+    } else if (d.parent.right === d) {
+      d.parent.right = child
+    } else {
+      throw new Error('Impossible!')
+    }
+    if (d.isBlack()) {
+      if (child.isRed()) {
+        child.blacken()
+      } else {
+        this._fixDelete(child)
+      }
+    }
+    this.root.blacken()
+    if (isFakeChild) {
+      if (child.parent.left === child) {
+        child.parent.left = null
+      } else if (child.parent.right === child) {
+        child.parent.right = null
+      } else {
+        throw new Error('Impossible #3')
+      }
+    }
+  }
+  _fixDelete (n) {
+    function isBlack (node) {
+      return node !== null ? node.isBlack() : true
+    }
+    function isRed (node) {
+      return node !== null ? node.isRed() : false
+    }
+    if (n.parent === null) {
+      // this can only be called after the first iteration of fixDelete.
+      return
+    }
+    // d was already replaced by the child
+    // d is not the root
+    // d and child are black
+    var sibling = n.sibling
+    if (isRed(sibling)) {
+      // make sibling the grandfather
+      n.parent.redden()
+      sibling.blacken()
+      if (n === n.parent.left) {
+        n.parent.rotateLeft(this)
+      } else if (n === n.parent.right) {
+        n.parent.rotateRight(this)
+      } else {
+        throw new Error('Impossible #2')
+      }
+      sibling = n.sibling
+    }
+    // parent, sibling, and children of n are black
+    if (n.parent.isBlack() &&
+      sibling.isBlack() &&
+      isBlack(sibling.left) &&
+      isBlack(sibling.right)
+    ) {
+      sibling.redden()
+      this._fixDelete(n.parent)
+    } else if (n.parent.isRed() &&
+      sibling.isBlack() &&
+      isBlack(sibling.left) &&
+      isBlack(sibling.right)
+    ) {
+      sibling.redden()
+      n.parent.blacken()
+    } else {
+      if (n === n.parent.left &&
+        sibling.isBlack() &&
+        isRed(sibling.left) &&
+        isBlack(sibling.right)
+      ) {
+        sibling.redden()
+        sibling.left.blacken()
+        sibling.rotateRight(this)
+        sibling = n.sibling
+      } else if (n === n.parent.right &&
+        sibling.isBlack() &&
+        isRed(sibling.right) &&
+        isBlack(sibling.left)
+      ) {
+        sibling.redden()
+        sibling.right.blacken()
+        sibling.rotateLeft(this)
+        sibling = n.sibling
+      }
+      sibling.color = n.parent.color
+      n.parent.blacken()
+      if (n === n.parent.left) {
+        sibling.right.blacken()
+        n.parent.rotateLeft(this)
+      } else {
+        sibling.left.blacken()
+        n.parent.rotateRight(this)
+      }
+    }
+  }
+  * put (v) {
+    if (v == null || v.id == null || v.id.constructor !== Array) {
+      throw new Error('v is expected to have an id property which is an Array!')
+    }
+    var node = new N(v)
+    if (this.root !== null) {
+      var p = this.root // p abbrev. parent
+      while (true) {
+        if (Y.utils.smaller(node.val.id, p.val.id)) {
+          if (p.left === null) {
+            p.left = node
+            break
+          } else {
+            p = p.left
+          }
+        } else if (Y.utils.smaller(p.val.id, node.val.id)) {
+          if (p.right === null) {
+            p.right = node
+            break
+          } else {
+            p = p.right
+          }
+        } else {
+          p.val = node.val
+          return p
+        }
+      }
+      this._fixInsert(node)
+    } else {
+      this.root = node
+    }
+    this.length++
+    this.root.blacken()
+    return node
+  }
+  _fixInsert (n) {
+    if (n.parent === null) {
+      n.blacken()
+      return
+    } else if (n.parent.isBlack()) {
+      return
+    }
+    var uncle = n.getUncle()
+    if (uncle !== null && uncle.isRed()) {
+      // Note: parent: red, uncle: red
+      n.parent.blacken()
+      uncle.blacken()
+      n.grandparent.redden()
+      this._fixInsert(n.grandparent)
+    } else {
+      // Note: parent: red, uncle: black or null
+      // Now we transform the tree in such a way that
+      // either of these holds:
+      //   1) grandparent.left.isRed
+      //     and grandparent.left.left.isRed
+      //   2) grandparent.right.isRed
+      //     and grandparent.right.right.isRed
+      if (n === n.parent.right && n.parent === n.grandparent.left) {
+        n.parent.rotateLeft(this)
+        // Since we rotated and want to use the previous
+        // cases, we need to set n in such a way that
+        // n.parent.isRed again
+        n = n.left
+      } else if (n === n.parent.left && n.parent === n.grandparent.right) {
+        n.parent.rotateRight(this)
+        // see above
+        n = n.right
+      }
+      // Case 1) or 2) hold from here on.
+      // Now traverse grandparent, make parent a black node
+      // on the highest level which holds two red nodes.
+      n.parent.blacken()
+      n.grandparent.redden()
+      if (n === n.parent.left) {
+        // Case 1
+        n.grandparent.rotateRight(this)
+      } else {
+        // Case 2
+        n.grandparent.rotateLeft(this)
+      }
+    }
+  }
+}
+
+Y.utils.RBTree = RBTree
--- a/src/Databases/RedBlackTree.spec.js
+++ b/src/Databases/RedBlackTree.spec.js
@@ -0,0 +1,212 @@
+/* global Y */
+/* eslint-env browser,jasmine,console */
+
+var numberOfRBTreeTests = 1000
+
+function itRedNodesDoNotHaveBlackChildren () {
+  it('Red nodes do not have black children', function () {
+    function traverse (n) {
+      if (n == null) {
+        return
+      }
+      if (n.isRed()) {
+        if (n.left != null) {
+          expect(n.left.isRed()).not.toBeTruthy()
+        }
+        if (n.right != null) {
+          expect(n.right.isRed()).not.toBeTruthy()
+        }
+      }
+      traverse(n.left)
+      traverse(n.right)
+    }
+    traverse(this.tree.root)
+  })
+}
+
+function itBlackHeightOfSubTreesAreEqual () {
+  it('Black-height of sub-trees are equal', function () {
+    function traverse (n) {
+      if (n == null) {
+        return 0
+      }
+      var sub1 = traverse(n.left)
+      var sub2 = traverse(n.right)
+      expect(sub1).toEqual(sub2)
+      if (n.isRed()) {
+        return sub1
+      } else {
+        return sub1 + 1
+      }
+    }
+    traverse(this.tree.root)
+  })
+}
+
+function itRootNodeIsBlack () {
+  it('root node is black', function () {
+    expect(this.tree.root == null || this.tree.root.isBlack()).toBeTruthy()
+  })
+}
+
+describe('RedBlack Tree', function () {
+  var tree, memory
+  describe('debug #2', function () {
+    beforeAll(function (done) {
+      this.memory = new Y.Memory(null, {
+        name: 'Memory',
+        gcTimeout: -1
+      })
+      this.tree = this.memory.os
+      tree = this.tree
+      memory = this.memory
+      memory.requestTransaction(function * () {
+        yield* tree.put({id: [8433]})
+        yield* tree.put({id: [12844]})
+        yield* tree.put({id: [1795]})
+        yield* tree.put({id: [30302]})
+        yield* tree.put({id: [64287]})
+        yield* tree.delete([8433])
+        yield* tree.put({id: [28996]})
+        yield* tree.delete([64287])
+        yield* tree.put({id: [22721]})
+        done()
+      })
+    })
+
+    itRootNodeIsBlack()
+    itBlackHeightOfSubTreesAreEqual([])
+  })
+
+  describe(`After adding&deleting (0.8/0.2) ${numberOfRBTreeTests} times`, function () {
+    var elements = []
+    beforeAll(function (done) {
+      this.memory = new Y.Memory(null, {
+        name: 'Memory',
+        gcTimeout: -1
+      })
+      this.tree = this.memory.os
+      tree = this.tree
+      memory = this.memory
+      memory.requestTransaction(function * () {
+        for (var i = 0; i < numberOfRBTreeTests; i++) {
+          var r = Math.random()
+          if (r < 0.8) {
+            var obj = [Math.floor(Math.random() * numberOfRBTreeTests * 10000)]
+            if (!tree.findNode(obj)) {
+              elements.push(obj)
+              yield* tree.put({id: obj})
+            }
+          } else if (elements.length > 0) {
+            var elemid = Math.floor(Math.random() * elements.length)
+            var elem = elements[elemid]
+            elements = elements.filter(function (e) {
+              return !Y.utils.compareIds(e, elem)
+            })
+            yield* tree.delete(elem)
+          }
+        }
+        done()
+      })
+    })
+
+    itRootNodeIsBlack()
+
+    it('can find every object', function (done) {
+      memory.requestTransaction(function * () {
+        for (var id of elements) {
+          expect((yield* tree.find(id)).id).toEqual(id)
+        }
+        done()
+      })
+    })
+
+    it('can find every object with lower bound search', function (done) {
+      this.memory.requestTransaction(function * () {
+        for (var id of elements) {
+          expect((yield* tree.findWithLowerBound(id)).id).toEqual(id)
+        }
+        done()
+      })
+    })
+    itRedNodesDoNotHaveBlackChildren()
+
+    itBlackHeightOfSubTreesAreEqual()
+
+    it('iterating over a tree with lower bound yields the right amount of results', function (done) {
+      var lowerBound = elements[Math.floor(Math.random() * elements.length)]
+      var expectedResults = elements.filter(function (e, pos) {
+        return (Y.utils.smaller(lowerBound, e) || Y.utils.compareIds(e, lowerBound)) && elements.indexOf(e) === pos
+      }).length
+
+      var actualResults = 0
+      this.memory.requestTransaction(function * () {
+        yield* tree.iterate(this, lowerBound, null, function * (val) {
+          expect(val).toBeDefined()
+          actualResults++
+        })
+        expect(expectedResults).toEqual(actualResults)
+        done()
+      })
+    })
+
+    it('iterating over a tree without bounds yield the right amount of results', function (done) {
+      var lowerBound = null
+      var expectedResults = elements.filter(function (e, pos) {
+        return elements.indexOf(e) === pos
+      }).length
+      var actualResults = 0
+      this.memory.requestTransaction(function * () {
+        yield* tree.iterate(this, lowerBound, null, function * (val) {
+          expect(val).toBeDefined()
+          actualResults++
+        })
+        expect(expectedResults).toEqual(actualResults)
+        done()
+      })
+    })
+
+    it('iterating over a tree with upper bound yields the right amount of results', function (done) {
+      var upperBound = elements[Math.floor(Math.random() * elements.length)]
+      var expectedResults = elements.filter(function (e, pos) {
+        return (Y.utils.smaller(e, upperBound) || Y.utils.compareIds(e, upperBound)) && elements.indexOf(e) === pos
+      }).length
+
+      var actualResults = 0
+      this.memory.requestTransaction(function * () {
+        yield* tree.iterate(this, null, upperBound, function * (val) {
+          expect(val).toBeDefined()
+          actualResults++
+        })
+        expect(expectedResults).toEqual(actualResults)
+        done()
+      })
+    })
+
+    it('iterating over a tree with upper and lower bounds yield the right amount of results', function (done) {
+      var b1 = elements[Math.floor(Math.random() * elements.length)]
+      var b2 = elements[Math.floor(Math.random() * elements.length)]
+      var upperBound, lowerBound
+      if (Y.utils.smaller(b1, b2)) {
+        lowerBound = b1
+        upperBound = b2
+      } else {
+        lowerBound = b2
+        upperBound = b1
+      }
+      var expectedResults = elements.filter(function (e, pos) {
+        return (Y.utils.smaller(lowerBound, e) || Y.utils.compareIds(e, lowerBound)) &&
+          (Y.utils.smaller(e, upperBound) || Y.utils.compareIds(e, upperBound)) && elements.indexOf(e) === pos
+      }).length
+      var actualResults = 0
+      this.memory.requestTransaction(function * () {
+        yield* tree.iterate(this, lowerBound, upperBound, function * (val) {
+          expect(val).toBeDefined()
+          actualResults++
+        })
+        expect(expectedResults).toEqual(actualResults)
+        done()
+      })
+    })
+  })
+})
--- a/src/Helper.spec.js
+++ b/src/Helper.spec.js
@@ -0,0 +1,288 @@
+/* global Y */
+/* eslint-env browser, jasmine */
+
+/*
+  This is just a compilation of functions that help to test this library!
+*/
+
+// When testing, you store everything on the global object. We call it g
+var g
+if (typeof global !== 'undefined') {
+  g = global
+} else if (typeof window !== 'undefined') {
+  g = window
+} else {
+  throw new Error('No global object?')
+}
+g.g = g
+
+g.YConcurrency_TestingMode = true
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000
+
+g.describeManyTimes = function describeManyTimes (times, name, f) {
+  for (var i = 0; i < times; i++) {
+    describe(name, f)
+  }
+}
+
+/*
+  Wait for a specified amount of time (in ms). defaults to 5ms
+*/
+function wait (t) {
+  if (t == null) {
+    t = 80
+  }
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      resolve()
+    }, t * 2)
+  })
+}
+g.wait = wait
+
+g.databases = ['Memory']
+if (typeof window !== 'undefined') {
+  g.databases.push('IndexedDB')
+}
+
+/*
+  returns a random element of o.
+  works on Object, and Array
+*/
+function getRandom (o) {
+  if (o instanceof Array) {
+    return o[Math.floor(Math.random() * o.length)]
+  } else if (o.constructor === Object) {
+    var ks = []
+    for (var key in o) {
+      ks.push(key)
+    }
+    return o[getRandom(ks)]
+  }
+}
+g.getRandom = getRandom
+
+function getRandomNumber (n) {
+  if (n == null) {
+    n = 9999
+  }
+  return Math.floor(Math.random() * n)
+}
+g.getRandomNumber = getRandomNumber
+
+function * applyTransactions (relAmount, numberOfTransactions, objects, users, transactions) {
+  function randomTransaction (root) {
+    var f = getRandom(transactions)
+    f(root)
+  }
+  for (var i = 0; i < numberOfTransactions * relAmount + 1; i++) {
+    var r = Math.random()
+    if (r >= 0.5) {
+      // 50% chance to flush
+      users[0].connector.flushOne() // flushes for some user.. (not necessarily 0)
+    } else if (r >= 0.05) {
+      // 45% chance to create operation
+      randomTransaction(getRandom(objects))
+    } else {
+      // 5% chance to disconnect/reconnect
+      var u = getRandom(users)
+      if (u.connector.isDisconnected()) {
+        yield u.reconnect()
+      } else {
+        yield u.disconnect()
+      }
+    }
+    yield wait()
+  }
+}
+
+g.applyRandomTransactionsAllRejoinNoGC = async(function * applyRandomTransactions (users, objects, transactions, numberOfTransactions) {
+  yield* applyTransactions(1, numberOfTransactions, objects, users, transactions)
+  yield users[0].connector.flushAll()
+  yield wait()
+  for (var u in users) {
+    yield users[u].reconnect()
+  }
+  yield wait(100)
+  yield users[0].connector.flushAll()
+  yield g.garbageCollectAllUsers(users)
+})
+
+g.applyRandomTransactionsWithGC = async(function * applyRandomTransactions (users, objects, transactions, numberOfTransactions) {
+  yield* applyTransactions(1, numberOfTransactions, objects, users.slice(1), transactions)
+  yield users[0].connector.flushAll()
+  yield g.garbageCollectAllUsers(users)
+  yield wait(100)
+  for (var u in users) {
+    // TODO: here, we enforce that two users never sync at the same time with u[0]
+    //       enforce that in the connector itself!
+    yield users[u].reconnect()
+  }
+  yield wait(100)
+  yield users[0].connector.flushAll()
+  yield wait(100)
+  yield g.garbageCollectAllUsers(users)
+})
+
+g.garbageCollectAllUsers = async(function * garbageCollectAllUsers (users) {
+  // gc two times because of the two gc phases (really collect everything)
+  yield wait(100)
+  for (var i in users) {
+    yield users[i].db.garbageCollect()
+    yield users[i].db.garbageCollect()
+  }
+  yield wait(100)
+})
+
+g.compareAllUsers = async(function * compareAllUsers (users) {
+  var s1, s2 // state sets
+  var ds1, ds2 // delete sets
+  var allDels1, allDels2 // all deletions
+  var db1 = [] // operation store of user1
+
+  // t1 and t2 basically do the same. They define t[1,2], ds[1,2], and allDels[1,2]
+  function * t1 () {
+    s1 = yield* this.getStateSet()
+    ds1 = yield* this.getDeleteSet()
+    allDels1 = []
+    yield* this.ds.iterate(this, null, null, function * (d) {
+      allDels1.push(d)
+    })
+  }
+  function * t2 () {
+    s2 = yield* this.getStateSet()
+    ds2 = yield* this.getDeleteSet()
+    allDels2 = []
+    yield* this.ds.iterate(this, null, null, function * (d) {
+      allDels2.push(d)
+    })
+  }
+  yield users[0].connector.flushAll()
+  yield wait()
+  yield g.garbageCollectAllUsers(users)
+
+  for (var uid = 0; uid < users.length; uid++) {
+    var u = users[uid]
+    u.db.requestTransaction(function * () {
+      // compare deleted ops against deleteStore
+      yield* this.os.iterate(this, null, null, function * (o) {
+        if (o.deleted === true) {
+          expect(yield* this.isDeleted(o.id)).toBeTruthy()
+        }
+      })
+      // compare deleteStore against deleted ops
+      var ds = []
+      yield* this.ds.iterate(this, null, null, function * (d) {
+        ds.push(d)
+      })
+      for (var j in ds) {
+        var d = ds[j]
+        for (var i = 0; i < d.len; i++) {
+          var o = yield* this.getOperation([d.id[0], d.id[1] + i])
+          // gc'd or deleted
+          if (d.gc) {
+            expect(o).toBeFalsy()
+          } else {
+            expect(o.deleted).toBeTruthy()
+          }
+        }
+      }
+    })
+    // compare allDels tree
+    yield wait()
+    if (s1 == null) {
+      u.db.requestTransaction(function * () {
+        yield* t1.call(this)
+        yield* this.os.iterate(this, null, null, function * (o) {
+          o = Y.utils.copyObject(o)
+          delete o.origin
+          db1.push(o)
+        })
+      })
+      yield wait()
+    } else {
+      // TODO: make requestTransaction return a promise..
+      u.db.requestTransaction(function * () {
+        yield* t2.call(this)
+        expect(s1).toEqual(s2)
+        expect(allDels1).toEqual(allDels2) // inner structure
+        expect(ds1).toEqual(ds2) // exported structure
+        var count = 0
+        yield* this.os.iterate(this, null, null, function * (o) {
+          o = Y.utils.copyObject(o)
+          delete o.origin
+          expect(db1[count++]).toEqual(o)
+        })
+      })
+      yield wait()
+    }
+  }
+})
+
+g.createUsers = async(function * createUsers (self, numberOfUsers, database) {
+  if (Y.utils.globalRoom.users[0] != null) {
+    yield Y.utils.globalRoom.users[0].flushAll()
+  }
+  // destroy old users
+  for (var u in Y.utils.globalRoom.users) {
+    Y.utils.globalRoom.users[u].y.destroy()
+  }
+  self.users = null
+
+  var promises = []
+  for (var i = 0; i < numberOfUsers; i++) {
+    promises.push(Y({
+      db: {
+        name: database,
+        namespace: 'User ' + i,
+        cleanStart: true,
+        gcTimeout: -1
+      },
+      connector: {
+        name: 'Test',
+        debug: false
+      }
+    }))
+  }
+  self.users = yield Promise.all(promises)
+  return self.users
+})
+
+/*
+  Until async/await arrives in js, we use this function to wait for promises
+  by yielding them.
+*/
+function async (makeGenerator) {
+  return function (arg) {
+    var generator = makeGenerator.apply(this, arguments)
+
+    function handle (result) {
+      if (result.done) return Promise.resolve(result.value)
+
+      return Promise.resolve(result.value).then(function (res) {
+        return handle(generator.next(res))
+      }, function (err) {
+        return handle(generator.throw(err))
+      })
+    }
+    try {
+      return handle(generator.next())
+    } catch (ex) {
+      generator.throw(ex)
+      // return Promise.reject(ex)
+    }
+  }
+}
+g.async = async
+
+function logUsers (self) {
+  if (self.constructor === Array) {
+    self = {users: self}
+  }
+  self.users[0].db.logTable()
+  self.users[1].db.logTable()
+  self.users[2].db.logTable()
+}
+
+g.logUsers = logUsers
--- a/src/Notes.md
+++ b/src/Notes.md
@@ -0,0 +1,12 @@
+
+# Notes
+
+### Terminology
+
+* DB: DataBase that holds all the information of the shared object. It is devided into the OS, DS, and SS. This can be a persistent database or an in-memory database. Depending on the type of database, it could make sense to store OS, DS, and SS in different tables, or maybe different databases.
+* OS: OperationStore holds all the operations. An operation is a js object with a fixed number of name fields.
+* DS: DeleteStore holds the information about which operations are deleted and which operations were garbage collected (no longer available in the OS).
+* SS: StateSet holds the current state of the OS. SS.getState(username) refers to the amount of operations that were received by that respective user.
+* Op: Operation defines an action on a shared type. But it is also the format in which we store the model of a type. This is why it is also called a Struct/Structure.
+* Type and Structure: We crearly distinguish between type and structure. Short explanation: A type (e.g. Strings, Numbers) have a number of functions that you can apply on them. (+) is well defined on both of them. They are *modeled* by a structure - the functions really change the structure of a type. Types can be implemented differently but still provide the same functionality. In Yjs, almost all types are realized as a doubly linked list (on which Yjs can provide eventual convergence)
+*
--- a/src/Struct.js
+++ b/src/Struct.js
@@ -0,0 +1,336 @@
+/* global Y */
+'use strict'
+
+/*
+ An operation also defines the structure of a type. This is why operation and
+ structure are used interchangeably here.
+
+ It must be of the type Object. I hope to achieve some performance
+ improvements when working on databases that support the json format.
+
+ An operation must have the following properties:
+
+ * encode
+     - Encode the structure in a readable format (preferably string- todo)
+ * decode (todo)
+     - decode structure to json
+ * execute
+     - Execute the semantics of an operation.
+ * requiredOps
+     - Operations that are required to execute this operation.
+*/
+
+var Struct = {
+  /* This is the only operation that is actually not a structure, because
+  it is not stored in the OS. This is why it _does not_ have an id
+
+  op = {
+    target: Id
+  }
+  */
+  Delete: {
+    encode: function (op) {
+      return op
+    },
+    requiredOps: function (op) {
+      return [] // [op.target]
+    },
+    execute: function * (op) {
+      return yield* this.deleteOperation(op.target)
+    }
+  },
+  Insert: {
+    /* {
+        content: any,
+        id: Id,
+        left: Id,
+        origin: Id,
+        right: Id,
+        parent: Id,
+        parentSub: string (optional), // child of Map type
+      }
+    */
+    encode: function (op) {
+      // TODO: you could not send the "left" property, then you also have to
+      // "op.left = null" in $execute or $decode
+      var e = {
+        id: op.id,
+        left: op.left,
+        right: op.right,
+        origin: op.origin,
+        parent: op.parent,
+        struct: op.struct
+      }
+      if (op.parentSub != null) {
+        e.parentSub = op.parentSub
+      }
+      if (op.opContent != null) {
+        e.opContent = op.opContent
+      } else {
+        e.content = op.content
+      }
+
+      return e
+    },
+    requiredOps: function (op) {
+      var ids = []
+      if (op.left != null) {
+        ids.push(op.left)
+      }
+      if (op.right != null) {
+        ids.push(op.right)
+      }
+      if (op.origin != null && !Y.utils.compareIds(op.left, op.origin)) {
+        ids.push(op.origin)
+      }
+      // if (op.right == null && op.left == null) {
+      ids.push(op.parent)
+
+      if (op.opContent != null) {
+        ids.push(op.opContent)
+      }
+      return ids
+    },
+    getDistanceToOrigin: function * (op) {
+      if (op.left == null) {
+        return 0
+      } else {
+        var d = 0
+        var o = yield* this.getOperation(op.left)
+        while (!Y.utils.compareIds(op.origin, (o ? o.id : null))) {
+          d++
+          if (o.left == null) {
+            break
+          } else {
+            o = yield* this.getOperation(o.left)
+          }
+        }
+        return d
+      }
+    },
+    /*
+    # $this has to find a unique position between origin and the next known character
+    # case 1: $origin equals $o.origin: the $creator parameter decides if left or right
+    #         let $OL= [o1,o2,o3,o4], whereby $this is to be inserted between o1 and o4
+    #         o2,o3 and o4 origin is 1 (the position of o2)
+    #         there is the case that $this.creator < o2.creator, but o3.creator < $this.creator
+    #         then o2 knows o3. Since on another client $OL could be [o1,o3,o4] the problem is complex
+    #         therefore $this would be always to the right of o3
+    # case 2: $origin < $o.origin
+    #         if current $this insert_position > $o origin: $this ins
+    #         else $insert_position will not change
+    #         (maybe we encounter case 1 later, then this will be to the right of $o)
+    # case 3: $origin > $o.origin
+    #         $this insert_position is to the left of $o (forever!)
+    */
+    execute: function *(op) {
+      var i // loop counter
+      var distanceToOrigin = i = yield* Struct.Insert.getDistanceToOrigin.call(this, op) // most cases: 0 (starts from 0)
+      var o
+      var parent
+      var start
+
+      // find o. o is the first conflicting operation
+      if (op.left != null) {
+        o = yield* this.getOperation(op.left)
+        o = (o.right == null) ? null : yield* this.getOperation(o.right)
+      } else { // left == null
+        parent = yield* this.getOperation(op.parent)
+        let startId = op.parentSub ? parent.map[op.parentSub] : parent.start
+        start = startId == null ? null : yield* this.getOperation(startId)
+        o = start
+      }
+
+      // handle conflicts
+      while (true) {
+        if (o != null && !Y.utils.compareIds(o.id, op.right)) {
+          var oOriginDistance = yield* Struct.Insert.getDistanceToOrigin.call(this, o)
+          if (oOriginDistance === i) {
+            // case 1
+            if (o.id[0] < op.id[0]) {
+              op.left = o.id
+              distanceToOrigin = i + 1
+            }
+          } else if (oOriginDistance < i) {
+            // case 2
+            if (i - distanceToOrigin <= oOriginDistance) {
+              op.left = o.id
+              distanceToOrigin = i + 1
+            }
+          } else {
+            break
+          }
+          i++
+          o = o.right ? yield* this.getOperation(o.right) : null
+        } else {
+          break
+        }
+      }
+
+      // reconnect..
+      var left = null
+      var right = null
+      parent = parent || (yield* this.getOperation(op.parent))
+
+      // reconnect left and set right of op
+      if (op.left != null) {
+        left = yield* this.getOperation(op.left)
+        op.right = left.right
+        left.right = op.id
+
+        yield* this.setOperation(left)
+      } else {
+        op.right = op.parentSub ? parent.map[op.parentSub] || null : parent.start
+      }
+      // reconnect right
+      if (op.right != null) {
+        right = yield* this.getOperation(op.right)
+        right.left = op.id
+
+        // if right exists, and it is supposed to be gc'd. Remove it from the gc
+        if (right.gc != null) {
+          this.store.removeFromGarbageCollector(right)
+        }
+        yield* this.setOperation(right)
+      }
+
+      // update parents .map/start/end properties
+      if (op.parentSub != null) {
+        if (left == null) {
+          parent.map[op.parentSub] = op.id
+          yield* this.setOperation(parent)
+        }
+        // is a child of a map struct.
+        // Then also make sure that only the most left element is not deleted
+        if (op.right != null) {
+          yield* this.deleteOperation(op.right, true)
+        }
+        if (op.left != null) {
+          yield* this.deleteOperation(op.id, true)
+        }
+      } else {
+        if (right == null || left == null) {
+          if (right == null) {
+            parent.end = op.id
+          }
+          if (left == null) {
+            parent.start = op.id
+          }
+          yield* this.setOperation(parent)
+        }
+      }
+    }
+  },
+  List: {
+    /*
+    {
+      start: null,
+      end: null,
+      struct: "List",
+      type: "",
+      id: this.os.getNextOpId()
+    }
+    */
+    encode: function (op) {
+      return {
+        struct: 'List',
+        id: op.id,
+        type: op.type
+      }
+    },
+    requiredOps: function () {
+      /*
+      var ids = []
+      if (op.start != null) {
+        ids.push(op.start)
+      }
+      if (op.end != null){
+        ids.push(op.end)
+      }
+      return ids
+      */
+      return []
+    },
+    execute: function * (op) {
+      op.start = null
+      op.end = null
+    },
+    ref: function * (op, pos) {
+      if (op.start == null) {
+        return null
+      }
+      var res = null
+      var o = yield* this.getOperation(op.start)
+
+      while (true) {
+        if (!o.deleted) {
+          res = o
+          pos--
+        }
+        if (pos >= 0 && o.right != null) {
+          o = (yield* this.getOperation(o.right))
+        } else {
+          break
+        }
+      }
+      return res
+    },
+    map: function * (o, f) {
+      o = o.start
+      var res = []
+      while (o != null) { // TODO: change to != (at least some convention)
+        var operation = yield* this.getOperation(o)
+        if (!operation.deleted) {
+          res.push(f(operation))
+        }
+        o = operation.right
+      }
+      return res
+    }
+  },
+  Map: {
+    /*
+      {
+        map: {},
+        struct: "Map",
+        type: "",
+        id: this.os.getNextOpId()
+      }
+    */
+    encode: function (op) {
+      return {
+        struct: 'Map',
+        type: op.type,
+        id: op.id,
+        map: {} // overwrite map!!
+      }
+    },
+    requiredOps: function () {
+      return []
+    },
+    execute: function * () {},
+    /*
+      Get a property by name
+    */
+    get: function * (op, name) {
+      var oid = op.map[name]
+      if (oid != null) {
+        var res = yield* this.getOperation(oid)
+        return (res == null || res.deleted) ? void 0 : (res.opContent == null
+          ? res.content : yield* this.getType(res.opContent))
+      }
+    },
+    /*
+      Delete a property by name
+    */
+    delete: function * (op, name) {
+      var v = op.map[name] || null
+      if (v != null) {
+        yield* Struct.Delete.create.call(this, {
+          target: v
+        })
+      }
+    }
+  }
+}
+Y.Struct = Struct
--- a/src/Transaction.js
+++ b/src/Transaction.js
@@ -0,0 +1,653 @@
+/* global Y */
+'use strict'
+
+/*
+  Partial definition of a transaction
+
+  A transaction provides all the the async functionality on a database.
+
+  By convention, a transaction has the following properties:
+  * ss for StateSet
+  * os for OperationStore
+  * ds for DeleteStore
+
+  A transaction must also define the following methods:
+  * checkDeleteStoreForState(state)
+    - When increasing the state of a user, an operation with an higher id
+      may already be garbage collected, and therefore it will never be received.
+      update the state to reflect this knowledge. This won't call a method to save the state!
+  * getDeleteSet(id)
+    - Get the delete set in a readable format:
+      {
+        "userX": [
+          [5,1], // starting from position 5, one operations is deleted
+          [9,4]  // starting from position 9, four operations are deleted
+        ],
+        "userY": ...
+      }
+  * getOpsFromDeleteSet(ds) -- TODO: just call this.deleteOperation(id) here
+    - get a set of deletions that need to be applied in order to get to
+      achieve the state of the supplied ds
+  * setOperation(op)
+    - write `op` to the database.
+      Note: this is allowed to return an in-memory object.
+      E.g. the Memory adapter returns the object that it has in-memory.
+      Changing values on this object will be stored directly in the database
+      without calling this function. Therefore,
+      setOperation may have no functionality in some adapters. This also has
+      implications on the way we use operations that were served from the database.
+      We try not to call copyObject, if not necessary.
+  * addOperation(op)
+    - add an operation to the database.
+      This may only be called once for every op.id
+      Must return a function that returns the next operation in the database (ordered by id)
+  * getOperation(id)
+  * removeOperation(id)
+    - remove an operation from the database. This is called when an operation
+      is garbage collected.
+  * setState(state)
+    - `state` is of the form
+      {
+        user: "1",
+        clock: 4
+      } <- meaning that we have four operations from user "1"
+           (with these id's respectively: 0, 1, 2, and 3)
+  * getState(user)
+  * getStateVector()
+    - Get the state of the OS in the form
+    [{
+      user: "userX",
+      clock: 11
+    },
+     ..
+    ]
+  * getStateSet()
+    - Get the state of the OS in the form
+    {
+      "userX": 11,
+      "userY": 22
+    }
+   * getOperations(startSS)
+     - Get the all the operations that are necessary in order to achive the
+       stateSet of this user, starting from a stateSet supplied by another user
+   * makeOperationReady(ss, op)
+     - this is called only by `getOperations(startSS)`. It makes an operation
+       applyable on a given SS.
+*/
+class Transaction {
+  /*
+    Get a type based on the id of its model.
+    If it does not exist yes, create it.
+    TODO: delete type from store.initializedTypes[id] when corresponding id was deleted!
+  */
+  * getType (id) {
+    var sid = JSON.stringify(id)
+    var t = this.store.initializedTypes[sid]
+    if (t == null) {
+      var op = yield* this.getOperation(id)
+      if (op != null) {
+        t = yield* Y[op.type].initType.call(this, this.store, op)
+        this.store.initializedTypes[sid] = t
+      }
+    }
+    return t
+  }
+  /*
+    Apply operations that this user created (no remote ones!)
+      * does not check for Struct.*.requiredOps()
+      * also broadcasts it through the connector
+  */
+  * applyCreatedOperations (ops) {
+    var send = []
+    for (var i = 0; i < ops.length; i++) {
+      var op = ops[i]
+      yield* this.store.tryExecute.call(this, op)
+      send.push(Y.Struct[op.struct].encode(op))
+    }
+    if (!this.store.y.connector.isDisconnected()) {
+      this.store.y.connector.broadcast({
+        type: 'update',
+        ops: send
+      })
+    }
+  }
+
+  * deleteList (start) {
+    if (this.store.y.connector.isSynced) {
+      while (start != null && this.store.y.connector.isSynced) {
+        start = (yield* this.getOperation(start))
+        start.gc = true
+        yield* this.setOperation(start)
+        // TODO: will always reset the parent..
+        this.store.gc1.push(start.id)
+        start = start.right
+      }
+    } else {
+      // TODO: when not possible??? do later in (gcWhenSynced)
+    }
+  }
+
+  /*
+    Mark an operation as deleted, and add it to the GC, if possible.
+  */
+  * deleteOperation (targetId, preventCallType) {
+    var target = yield* this.getOperation(targetId)
+    var callType = false
+
+    if (target == null || !target.deleted) {
+      yield* this.markDeleted(targetId)
+    }
+
+    if (target != null && target.gc == null) {
+      if (!target.deleted) {
+        callType = true
+        // set deleted & notify type
+        target.deleted = true
+        /*
+        if (!preventCallType) {
+          var type = this.store.initializedTypes[JSON.stringify(target.parent)]
+          if (type != null) {
+            yield* type._changed(this, {
+              struct: 'Delete',
+              target: targetId
+            })
+          }
+        }
+        */
+        // delete containing lists
+        if (target.start != null) {
+          // TODO: don't do it like this .. -.-
+          yield* this.deleteList(target.start)
+          yield* this.deleteList(target.id)
+        }
+        if (target.map != null) {
+          for (var name in target.map) {
+            yield* this.deleteList(target.map[name])
+          }
+          // TODO: here to..  (see above)
+          yield* this.deleteList(target.id)
+        }
+        if (target.opContent != null) {
+          yield* this.deleteOperation(target.opContent)
+          target.opContent = null
+        }
+      }
+      var left = target.left != null ? yield* this.getOperation(target.left) : null
+
+      this.store.addToGarbageCollector(target, left)
+
+      // set here because it was deleted and/or gc'd
+      yield* this.setOperation(target)
+
+      /*
+        Check if it is possible to add right to the gc.
+        Because this delete can't be responsible for left being gc'd,
+        we don't have to add left to the gc..
+      */
+      var right = target.right != null ? yield* this.getOperation(target.right) : null
+      if (
+        right != null &&
+        this.store.addToGarbageCollector(right, target)
+      ) {
+        yield* this.setOperation(right)
+      }
+      return callType
+    }
+  }
+  /*
+    Mark an operation as deleted&gc'd
+  */
+  * markGarbageCollected (id) {
+    // this.mem.push(["gc", id]);
+    var n = yield* this.markDeleted(id)
+    if (!n.gc) {
+      if (n.id[1] < id[1]) {
+        // un-extend left
+        var newlen = n.len - (id[1] - n.id[1])
+        n.len -= newlen
+        yield* this.ds.put(n)
+        n = {id: id, len: newlen, gc: false}
+        yield* this.ds.put(n)
+      }
+      // get prev&next before adding a new operation
+      var prev = yield* this.ds.findPrev(id)
+      var next = yield* this.ds.findNext(id)
+
+      if (id[1] < n.id[1] + n.len - 1) {
+        // un-extend right
+        yield* this.ds.put({id: [id[0], id[1] + 1], len: n.len - 1, gc: false})
+        n.len = 1
+      }
+      // set gc'd
+      n.gc = true
+      // can extend left?
+      if (
+        prev != null &&
+        prev.gc &&
+        Y.utils.compareIds([prev.id[0], prev.id[1] + prev.len], n.id)
+      ) {
+        prev.len += n.len
+        yield* this.ds.delete(n.id)
+        n = prev
+        // ds.put n here?
+      }
+      // can extend right?
+      if (
+        next != null &&
+        next.gc &&
+        Y.utils.compareIds([n.id[0], n.id[1] + n.len], next.id)
+      ) {
+        n.len += next.len
+        yield* this.ds.delete(next.id)
+      }
+      yield* this.ds.put(n)
+    }
+  }
+  /*
+    Mark an operation as deleted.
+
+    returns the delete node
+  */
+  * markDeleted (id) {
+    // this.mem.push(["del", id]);
+    var n = yield* this.ds.findWithUpperBound(id)
+    if (n != null && n.id[0] === id[0]) {
+      if (n.id[1] <= id[1] && id[1] < n.id[1] + n.len) {
+        // already deleted
+        return n
+      } else if (n.id[1] + n.len === id[1] && !n.gc) {
+        // can extend existing deletion
+        n.len++
+      } else {
+        // cannot extend left
+        n = {id: id, len: 1, gc: false}
+        yield* this.ds.put(n)
+      }
+    } else {
+      // cannot extend left
+      n = {id: id, len: 1, gc: false}
+      yield* this.ds.put(n)
+    }
+    // can extend right?
+    var next = yield* this.ds.findNext(n.id)
+    if (
+      next != null &&
+      Y.utils.compareIds([n.id[0], n.id[1] + n.len], next.id) &&
+      !next.gc
+    ) {
+      n.len = n.len + next.len
+      yield* this.ds.delete(next.id)
+    }
+    yield* this.ds.put(n)
+    return n
+  }
+  /*
+    Call this method when the client is connected&synced with the
+    other clients (e.g. master). This will query the database for
+    operations that can be gc'd and add them to the garbage collector.
+  */
+  * garbageCollectAfterSync () {
+    yield* this.os.iterate(this, null, null, function * (op) {
+      if (op.deleted && op.left != null) {
+        var left = yield* this.getOperation(op.left)
+        this.store.addToGarbageCollector(op, left)
+      }
+    })
+  }
+  /*
+    Really remove an op and all its effects.
+    The complicated case here is the Insert operation:
+    * reset left
+    * reset right
+    * reset parent.start
+    * reset parent.end
+    * reset origins of all right ops
+  */
+  * garbageCollectOperation (id) {
+    this.store.addToDebug('yield* this.garbageCollectOperation(', id, ')')
+    // check to increase the state of the respective user
+    var state = yield* this.getState(id[0])
+    if (state.clock === id[1]) {
+      state.clock++
+      // also check if more expected operations were gc'd
+      yield* this.checkDeleteStoreForState(state)
+      // then set the state
+      yield* this.setState(state)
+    }
+    yield* this.markGarbageCollected(id)
+
+    // if op exists, then clean that mess up..
+    var o = yield* this.getOperation(id)
+    if (o != null) {
+      /*
+      if (!o.deleted) {
+        yield* this.deleteOperation(id)
+        o = yield* this.getOperation(id)
+      }
+      */
+
+      // remove gc'd op from the left op, if it exists
+      if (o.left != null) {
+        var left = yield* this.getOperation(o.left)
+        left.right = o.right
+        yield* this.setOperation(left)
+      }
+      // remove gc'd op from the right op, if it exists
+      // also reset origins of right ops
+      if (o.right != null) {
+        var right = yield* this.getOperation(o.right)
+        right.left = o.left
+        if (Y.utils.compareIds(right.origin, o.id)) { // rights origin is o
+          // find new origin of right ops
+          // origin is the first left deleted operation
+          var neworigin = o.left
+          while (neworigin != null) {
+            var neworigin_ = yield* this.getOperation(neworigin)
+            if (neworigin_.deleted) {
+              break
+            }
+            neworigin = neworigin_.left
+          }
+
+          // reset origin of right
+          right.origin = neworigin
+
+          // reset origin of all right ops (except first right - duh!),
+          // until you find origin pointer to the left of o
+          var i = right.right == null ? null : yield* this.getOperation(right.right)
+          var ids = [o.id, o.right]
+          while (i != null && ids.some(function (id) {
+            return Y.utils.compareIds(id, i.origin)
+          })) {
+            if (Y.utils.compareIds(i.origin, o.id)) {
+              // reset origin of i
+              i.origin = neworigin
+              yield* this.setOperation(i)
+            }
+            // get next i
+            i = i.right == null ? null : yield* this.getOperation(i.right)
+          }
+        } /* otherwise, rights origin is to the left of o,
+             then there is no right op (from o), that origins in o */
+        yield* this.setOperation(right)
+      }
+
+      if (o.parent != null) {
+        // remove gc'd op from parent, if it exists
+        var parent = yield* this.getOperation(o.parent)
+        var setParent = false // whether to save parent to the os
+        if (o.parentSub != null) {
+          if (Y.utils.compareIds(parent.map[o.parentSub], o.id)) {
+            setParent = true
+            parent.map[o.parentSub] = o.right
+          }
+        } else {
+          if (Y.utils.compareIds(parent.start, o.id)) {
+            // gc'd op is the start
+            setParent = true
+            parent.start = o.right
+          }
+          if (Y.utils.compareIds(parent.end, o.id)) {
+            // gc'd op is the end
+            setParent = true
+            parent.end = o.left
+          }
+        }
+        if (setParent) {
+          yield* this.setOperation(parent)
+        }
+      }
+      // finally remove it from the os
+      yield* this.removeOperation(o.id)
+    }
+  }
+  * checkDeleteStoreForState (state) {
+    var n = yield* this.ds.findWithUpperBound([state.user, state.clock])
+    if (n != null && n.id[0] === state.user && n.gc) {
+      state.clock = Math.max(state.clock, n.id[1] + n.len)
+    }
+  }
+  /*
+    apply a delete set in order to get
+    the state of the supplied ds
+  */
+  * applyDeleteSet (ds) {
+    var deletions = []
+    function createDeletions (user, start, len, gc) {
+      for (var c = start; c < start + len; c++) {
+        deletions.push([user, c, gc])
+      }
+    }
+
+    for (var user in ds) {
+      var dv = ds[user]
+      var pos = 0
+      var d = dv[pos]
+      yield* this.ds.iterate(this, [user, 0], [user, Number.MAX_VALUE], function * (n) {
+        // cases:
+        // 1. d deletes something to the right of n
+        //  => go to next n (break)
+        // 2. d deletes something to the left of n
+        //  => create deletions
+        //  => reset d accordingly
+        //  *)=> if d doesn't delete anything anymore, go to next d (continue)
+        // 3. not 2) and d deletes something that also n deletes
+        //  => reset d so that it doesn't contain n's deletion
+        //  *)=> if d does not delete anything anymore, go to next d (continue)
+        while (d != null) {
+          var diff = 0 // describe the diff of length in 1) and 2)
+          if (n.id[1] + n.len <= d[0]) {
+            // 1)
+            break
+          } else if (d[0] < n.id[1]) {
+            // 2)
+            // delete maximum the len of d
+            // else delete as much as possible
+            diff = Math.min(n.id[1] - d[0], d[1])
+            createDeletions(user, d[0], diff, d[2])
+          } else {
+            // 3)
+            diff = n.id[1] + n.len - d[0] // never null (see 1)
+            if (d[2] && !n.gc) {
+              // d marks as gc'd but n does not
+              // then delete either way
+              createDeletions(user, d[0], Math.min(diff, d[1]), d[2])
+            }
+          }
+          if (d[1] <= diff) {
+            // d doesn't delete anything anymore
+            d = dv[++pos]
+          } else {
+            d[0] = d[0] + diff // reset pos
+            d[1] = d[1] - diff // reset length
+          }
+        }
+      })
+      // for the rest.. just apply it
+      for (; pos < dv.length; pos++) {
+        d = dv[pos]
+        createDeletions(user, d[0], d[1], d[2])
+      }
+    }
+    for (var i in deletions) {
+      var del = deletions[i]
+      var id = [del[0], del[1]]
+      // always try to delete..
+      var addOperation = yield* this.deleteOperation(id)
+      if (addOperation) {
+        // TODO:.. really .. here? You could prevent calling all these functions in operationAdded
+        yield* this.store.operationAdded(this, {struct: 'Delete', target: id})
+      }
+      if (del[2]) {
+        // gc
+        yield* this.garbageCollectOperation(id)
+      }
+    }
+  }
+  * isGarbageCollected (id) {
+    var n = yield* this.ds.findWithUpperBound(id)
+    return n != null && n.id[0] === id[0] && id[1] < n.id[1] + n.len && n.gc
+  }
+  /*
+    A DeleteSet (ds) describes all the deleted ops in the OS
+  */
+  * getDeleteSet () {
+    var ds = {}
+    yield* this.ds.iterate(this, null, null, function * (n) {
+      var user = n.id[0]
+      var counter = n.id[1]
+      var len = n.len
+      var gc = n.gc
+      var dv = ds[user]
+      if (dv === void 0) {
+        dv = []
+        ds[user] = dv
+      }
+      dv.push([counter, len, gc])
+    })
+    return ds
+  }
+  * isDeleted (id) {
+    var n = yield* this.ds.findWithUpperBound(id)
+    return n != null && n.id[0] === id[0] && id[1] < n.id[1] + n.len
+  }
+  * setOperation (op) {
+    yield* this.os.put(op)
+    return op
+  }
+  * addOperation (op) {
+    yield* this.os.put(op)
+  }
+  * getOperation (id) {
+    return yield* this.os.find(id)
+  }
+  * removeOperation (id) {
+    yield* this.os.delete(id)
+  }
+  * setState (state) {
+    var val = {
+      id: [state.user],
+      clock: state.clock
+    }
+    // TODO: find a way to skip this step.. (after implementing some dbs..)
+    if (yield* this.ss.find([state.user])) {
+      yield* this.ss.put(val)
+    } else {
+      yield* this.ss.put(val)
+    }
+  }
+  * getState (user) {
+    var n
+    var clock = (n = yield* this.ss.find([user])) == null ? null : n.clock
+    if (clock == null) {
+      clock = 0
+    }
+    return {
+      user: user,
+      clock: clock
+    }
+  }
+  * getStateVector () {
+    var stateVector = []
+    yield* this.ss.iterate(this, null, null, function * (n) {
+      stateVector.push({
+        user: n.id[0],
+        clock: n.clock
+      })
+    })
+    return stateVector
+  }
+  * getStateSet () {
+    var ss = {}
+    yield* this.ss.iterate(this, null, null, function * (n) {
+      ss[n.id[0]] = n.clock
+    })
+    return ss
+  }
+  * getOperations (startSS) {
+    // TODO: use bounds here!
+    if (startSS == null) {
+      startSS = {}
+    }
+    var ops = []
+
+    var endSV = yield* this.getStateVector()
+    for (var endState of endSV) {
+      var user = endState.user
+      if (user === '_') {
+        continue
+      }
+      var startPos = startSS[user] || 0
+
+      yield* this.os.iterate(this, [user, startPos], [user, Number.MAX_VALUE], function * (op) {
+        ops.push(op)
+      })
+    }
+    var res = []
+    for (var op of ops) {
+      res.push(yield* this.makeOperationReady(startSS, op))
+    }
+    return res
+  }
+  /*
+    Here, we make op executable for the receiving user.
+
+    Notes:
+      startSS: denotes to the SV that the remote user sent
+      currSS:  denotes to the state vector that the user should have if he
+               applies all already sent operations (increases is each step)
+
+    We face several problems:
+    * Execute op as is won't work because ops depend on each other
+     -> find a way so that they do not anymore
+    * When changing left, must not go more to the left than the origin
+    * When changing right, you have to consider that other ops may have op
+      as their origin, this means that you must not set one of these ops
+      as the new right (interdependencies of ops)
+    * can't just go to the right until you find the first known operation,
+      With currSS
+        -> interdependency of ops is a problem
+      With startSS
+        -> leads to inconsistencies when two users join at the same time.
+           Then the position depends on the order of execution -> error!
+
+      Solution:
+      -> re-create originial situation
+        -> set op.left = op.origin (which never changes)
+        -> set op.right
+             to the first operation that is known (according to startSS)
+             or to the first operation that has an origin that is not to the
+             right of op.
+        -> Enforces unique execution order -> happy user
+
+      Improvements: TODO
+        * Could set left to origin, or the first known operation
+          (startSS or currSS.. ?)
+          -> Could be necessary when I turn GC again.
+          -> Is a bad(ish) idea because it requires more computation
+  */
+  * makeOperationReady (startSS, op) {
+    op = Y.Struct[op.struct].encode(op)
+    op = Y.utils.copyObject(op)
+    var o = op
+    var ids = [op.id]
+    // search for the new op.right
+    // it is either the first known op (according to startSS)
+    // or the o that has no origin to the right of op
+    // (this is why we use the ids array)
+    while (o.right != null) {
+      var right = yield* this.getOperation(o.right)
+      if (o.right[1] < (startSS[o.right[0]] || 0) || !ids.some(function (id) {
+        return Y.utils.compareIds(id, right.origin)
+      })) {
+        break
+      }
+      ids.push(o.right)
+      o = right
+    }
+    op.right = o.right
+    op.left = op.origin
+    return op
+  }
+}
+Y.Transaction = Transaction
--- a/src/Types/Array.js
+++ b/src/Types/Array.js
@@ -0,0 +1,192 @@
+/* global Y */
+'use strict'
+
+;(function () {
+  class YArray {
+    constructor (os, _model, idArray, valArray) {
+      this.os = os
+      this._model = _model
+      // Array of all the operation id's
+      this.idArray = idArray
+      // Array of all the values
+      this.valArray = valArray
+      this.eventHandler = new Y.utils.EventHandler(ops => {
+        var userEvents = []
+        for (var i in ops) {
+          var op = ops[i]
+          if (op.struct === 'Insert') {
+            let pos
+            // we check op.left only!,
+            // because op.right might not be defined when this is called
+            if (op.left === null) {
+              pos = 0
+            } else {
+              var sid = JSON.stringify(op.left)
+              pos = this.idArray.indexOf(sid) + 1
+              if (pos <= 0) {
+                throw new Error('Unexpected operation!')
+              }
+            }
+            this.idArray.splice(pos, 0, JSON.stringify(op.id))
+            this.valArray.splice(pos, 0, op.content)
+            userEvents.push({
+              type: 'insert',
+              object: this,
+              index: pos,
+              length: 1
+            })
+          } else if (op.struct === 'Delete') {
+            let pos = this.idArray.indexOf(JSON.stringify(op.target))
+            if (pos >= 0) {
+              this.idArray.splice(pos, 1)
+              this.valArray.splice(pos, 1)
+              userEvents.push({
+                type: 'delete',
+                object: this,
+                index: pos,
+                length: 1
+              })
+            }
+          } else {
+            throw new Error('Unexpected struct!')
+          }
+        }
+        this.eventHandler.callEventListeners(userEvents)
+      })
+    }
+    get length () {
+      return this.idArray.length
+    }
+    get (pos) {
+      if (pos == null || typeof pos !== 'number') {
+        throw new Error('pos must be a number!')
+      }
+      return this.valArray[pos]
+    }
+    toArray () {
+      return this.valArray.slice()
+    }
+    insert (pos, contents) {
+      if (typeof pos !== 'number') {
+        throw new Error('pos must be a number!')
+      }
+      if (!(contents instanceof Array)) {
+        throw new Error('contents must be an Array of objects!')
+      }
+      if (contents.length === 0) {
+        return
+      }
+      if (pos > this.idArray.length || pos < 0) {
+        throw new Error('This position exceeds the range of the array!')
+      }
+      var mostLeft = pos === 0 ? null : JSON.parse(this.idArray[pos - 1])
+
+      var ops = []
+      var prevId = mostLeft
+      for (var i = 0; i < contents.length; i++) {
+        var op = {
+          left: prevId,
+          origin: prevId,
+          // right: mostRight,
+          // NOTE: I intentionally do not define right here, because it could be deleted
+          // at the time of creating this operation, and is therefore not defined in idArray
+          parent: this._model,
+          content: contents[i],
+          struct: 'Insert',
+          id: this.os.getNextOpId()
+        }
+        ops.push(op)
+        prevId = op.id
+      }
+      var eventHandler = this.eventHandler
+      eventHandler.awaitAndPrematurelyCall(ops)
+      this.os.requestTransaction(function *() {
+        // now we can set the right reference.
+        var mostRight
+        if (mostLeft != null) {
+          mostRight = (yield* this.getOperation(mostLeft)).right
+        } else {
+          mostRight = (yield* this.getOperation(ops[0].parent)).start
+        }
+        for (var j in ops) {
+          ops[j].right = mostRight
+        }
+        yield* this.applyCreatedOperations(ops)
+        eventHandler.awaitedInserts(ops.length)
+      })
+    }
+    delete (pos, length) {
+      if (length == null) { length = 1 }
+      if (typeof length !== 'number') {
+        throw new Error('pos must be a number!')
+      }
+      if (typeof pos !== 'number') {
+        throw new Error('pos must be a number!')
+      }
+      if (pos + length > this.idArray.length || pos < 0 || length < 0) {
+        throw new Error('The deletion range exceeds the range of the array!')
+      }
+      if (length === 0) {
+        return
+      }
+      var eventHandler = this.eventHandler
+      var newLeft = pos > 0 ? JSON.parse(this.idArray[pos - 1]) : null
+      var dels = []
+      for (var i = 0; i < length; i++) {
+        dels.push({
+          target: JSON.parse(this.idArray[pos + i]),
+          struct: 'Delete'
+        })
+      }
+      eventHandler.awaitAndPrematurelyCall(dels)
+      this.os.requestTransaction(function *() {
+        yield* this.applyCreatedOperations(dels)
+        eventHandler.awaitedDeletes(dels.length, newLeft)
+      })
+    }
+    observe (f) {
+      this.eventHandler.addEventListener(f)
+    }
+    * _changed (transaction, op) {
+      if (!op.deleted) {
+        if (op.struct === 'Insert') {
+          var l = op.left
+          var left
+          while (l != null) {
+            left = yield* transaction.getOperation(l)
+            if (!left.deleted) {
+              break
+            }
+            l = left.left
+          }
+          op.left = l
+        }
+        this.eventHandler.receivedOp(op)
+      }
+    }
+  }
+
+  Y.Array = new Y.utils.CustomType({
+    class: YArray,
+    createType: function * YArrayCreator () {
+      var modelid = this.store.getNextOpId()
+      var model = {
+        struct: 'List',
+        type: 'Array',
+        start: null,
+        end: null,
+        id: modelid
+      }
+      yield* this.applyCreatedOperations([model])
+      return modelid
+    },
+    initType: function * YArrayInitializer (os, model) {
+      var valArray = []
+      var idArray = yield* Y.Struct.List.map.call(this, model, function (c) {
+        valArray.push(c.content)
+        return JSON.stringify(c.id)
+      })
+      return new YArray(os, model.id, idArray, valArray)
+    }
+  })
+})()
--- a/src/Types/Array.spec.js
+++ b/src/Types/Array.spec.js
@@ -0,0 +1,310 @@
+/* global createUsers, databases, wait, Y, compareAllUsers, getRandomNumber, applyRandomTransactionsAllRejoinNoGC, applyRandomTransactionsWithGC, async, garbageCollectAllUsers, describeManyTimes */
+/* eslint-env browser,jasmine */
+
+var numberOfYArrayTests = 50
+var repeatArrayTests = 2
+
+for (let database of databases) {
+  describe(`Array Type (DB: ${database})`, function () {
+    var y1, y2, y3, yconfig1, yconfig2, yconfig3, flushAll
+
+    beforeEach(async(function * (done) {
+      yield createUsers(this, 3, database)
+      y1 = (yconfig1 = this.users[0]).root
+      y2 = (yconfig2 = this.users[1]).root
+      y3 = (yconfig3 = this.users[2]).root
+      flushAll = this.users[0].connector.flushAll
+      yield wait(10)
+      done()
+    }))
+    afterEach(async(function * (done) {
+      yield compareAllUsers(this.users)
+      done()
+    }))
+
+    describe('Basic tests', function () {
+      it('insert three elements, try re-get property', async(function * (done) {
+        var array = yield y1.set('Array', Y.Array)
+        array.insert(0, [1, 2, 3])
+        array = yield y1.get('Array') // re-get property
+        expect(array.toArray()).toEqual([1, 2, 3])
+        done()
+      }))
+      it('Basic insert in array (handle three conflicts)', async(function * (done) {
+        yield y1.set('Array', Y.Array)
+        yield flushAll()
+        var l1 = yield y1.get('Array')
+        l1.insert(0, [0])
+        var l2 = yield y2.get('Array')
+        l2.insert(0, [1])
+        var l3 = yield y3.get('Array')
+        l3.insert(0, [2])
+        yield flushAll()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        expect(l2.toArray()).toEqual(l3.toArray())
+        done()
+      }))
+      it('Basic insert&delete in array (handle three conflicts)', async(function * (done) {
+        var l1, l2, l3
+        l1 = yield y1.set('Array', Y.Array)
+        l1.insert(0, ['x', 'y', 'z'])
+        yield flushAll()
+        l1.insert(1, [0])
+        l2 = yield y2.get('Array')
+        l2.delete(0)
+        l2.delete(1)
+        l3 = yield y3.get('Array')
+        l3.insert(1, [2])
+        yield flushAll()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        expect(l2.toArray()).toEqual(l3.toArray())
+        expect(l2.toArray()).toEqual([0, 2, 'y'])
+        done()
+      }))
+      it('Handles getOperations ascending ids bug in late sync', async(function * (done) {
+        var l1, l2
+        l1 = yield y1.set('Array', Y.Array)
+        l1.insert(0, ['x', 'y'])
+        yield flushAll()
+        yconfig3.disconnect()
+        yconfig2.disconnect()
+        yield wait()
+        l2 = yield y2.get('Array')
+        l2.insert(1, [2])
+        l2.insert(1, [3])
+        yield yconfig2.reconnect()
+        yield yconfig3.reconnect()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        done()
+      }))
+      it('Handles deletions in late sync', async(function * (done) {
+        var l1, l2
+        l1 = yield y1.set('Array', Y.Array)
+        l1.insert(0, ['x', 'y'])
+        yield flushAll()
+        yield yconfig2.disconnect()
+        yield wait()
+        l2 = yield y2.get('Array')
+        l2.delete(1, 1)
+        l1.delete(0, 2)
+        yield yconfig2.reconnect()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        done()
+      }))
+      it('Handles deletions in late sync (2)', async(function * (done) {
+        var l1, l2
+        l1 = yield y1.set('Array', Y.Array)
+        yield flushAll()
+        l2 = yield y2.get('Array')
+        l1.insert(0, ['x', 'y'])
+        l1.delete(0, 2)
+        yield flushAll()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        done()
+      }))
+      it('Basic insert. Then delete the whole array', async(function * (done) {
+        var l1, l2, l3
+        l1 = yield y1.set('Array', Y.Array)
+        l1.insert(0, ['x', 'y', 'z'])
+        yield flushAll()
+        l1.delete(0, 3)
+        l2 = yield y2.get('Array')
+        l3 = yield y3.get('Array')
+        yield flushAll()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        expect(l2.toArray()).toEqual(l3.toArray())
+        expect(l2.toArray()).toEqual([])
+        done()
+      }))
+      it('Basic insert. Then delete the whole array (merge listeners on late sync)', async(function * (done) {
+        var l1, l2, l3
+        l1 = yield y1.set('Array', Y.Array)
+        l1.insert(0, ['x', 'y', 'z'])
+        yield flushAll()
+        yconfig2.disconnect()
+        l1.delete(0, 3)
+        l2 = yield y2.get('Array')
+        yield wait()
+        yield yconfig2.reconnect()
+        yield wait()
+        l3 = yield y3.get('Array')
+        yield flushAll()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        expect(l2.toArray()).toEqual(l3.toArray())
+        expect(l2.toArray()).toEqual([])
+        done()
+      }))
+      // TODO?
+      /* it('Basic insert. Then delete the whole array (merge deleter on late sync)', async(function * (done) {
+        var l1, l2, l3
+        l1 = yield y1.set('Array', Y.Array)
+        l1.insert(0, ['x', 'y', 'z'])
+        yield flushAll()
+        yconfig1.disconnect()
+        l1.delete(0, 3)
+        l2 = yield y2.get('Array')
+        yield yconfig1.reconnect()
+        l3 = yield y3.get('Array')
+        yield flushAll()
+        expect(l1.toArray()).toEqual(l2.toArray())
+        expect(l2.toArray()).toEqual(l3.toArray())
+        expect(l2.toArray()).toEqual([])
+        done()
+      })) */
+      it('throw insert & delete events', async(function * (done) {
+        var array = yield this.users[0].root.set('array', Y.Array)
+        var event
+        array.observe(function (e) {
+          event = e
+        })
+        array.insert(0, [0])
+        expect(event).toEqual([{
+          type: 'insert',
+          object: array,
+          index: 0,
+          length: 1
+        }])
+        array.delete(0)
+        expect(event).toEqual([{
+          type: 'delete',
+          object: array,
+          index: 0,
+          length: 1
+        }])
+        yield wait(50)
+        done()
+      }))
+      it('garbage collects', async(function * (done) {
+        var l1, l2, l3
+        l1 = yield y1.set('Array', Y.Array)
+        l1.insert(0, ['x', 'y', 'z'])
+        yield flushAll()
+        yconfig1.disconnect()
+        l1.delete(0, 3)
+        l2 = yield y2.get('Array')
+        yield wait()
+        yield yconfig1.reconnect()
+        yield wait()
+        l3 = yield y3.get('Array')
+        yield flushAll()
+        yield garbageCollectAllUsers(this.users)
+        expect(l1.toArray()).toEqual(l2.toArray())
+        expect(l2.toArray()).toEqual(l3.toArray())
+        expect(l2.toArray()).toEqual([])
+        done()
+      }))
+      it('debug right not existend in Insert.execute', async(function * (done) {
+        yconfig1.db.requestTransaction(function * () {
+          var ops = [{'struct':'Map','type':'Map','id':['130',0],'map':{}},{'id':['130',1],'left':null,'right':null,'origin':null,'parent':['_',0],'struct':'Insert','parentSub':'Map','opContent':['130',0]},{'struct':'Map','type':'Map','id':['130',0],'map':{}},{'id':['130',1],'left':null,'right':null,'origin':null,'parent':['_',0],'struct':'Insert','parentSub':'Map','opContent':['130',0]},{'struct':'Map','type':'Map','id':['130',0],'map':{}},{'id':['130',1],'left':null,'right':null,'origin':null,'parent':['_',0],'struct':'Insert','parentSub':'Map','opContent':['130',0]},{'left':null,'right':null,'origin':null,'parent':['130',0],'parentSub':'somekey','struct':'Insert','content':512,'id':['133',0]},{'id':['130',2],'left':null,'right':null,'origin':null,'parent':['130',0],'struct':'Insert','parentSub':'somekey','content':1131},{'id':['130',3],'left':null,'right':['130',2],'origin':null,'parent':['130',0],'struct':'Insert','parentSub':'somekey','content':4196},{'id':['131',3],'left':null,'right':null,'origin':null,'parent':['130',0],'struct':'Insert','parentSub':'somekey','content':5022}]//eslint-disable-line
+
+          for (var o of ops) {
+            yield* this.store.tryExecute.call(this, o)
+          }
+        })
+        yield wait()
+        yield yconfig3.disconnect()
+        yield yconfig2.disconnect()
+        yield flushAll()
+        wait()
+        yield yconfig3.reconnect()
+        yield yconfig2.reconnect()
+        yield wait()
+        yield flushAll()
+        done()
+      }))
+      it('debug right not existend in Insert.execute (2)', async(function * (done) {
+        yconfig1.db.requestTransaction(function * () {
+          yield* this.store.tryExecute.call(this, {'struct': 'Map', 'type': 'Map', 'id': ['153', 0], 'map': {}})
+          yield* this.store.tryExecute.call(this, {'id': ['153', 1], 'left': null, 'right': null, 'origin': null, 'parent': ['_', 0], 'struct': 'Insert', 'parentSub': 'Map', 'opContent': ['153', 0]})
+          yield* this.store.tryExecute.call(this, {'struct': 'Map', 'type': 'Map', 'id': ['153', 0], 'map': {}})
+          yield* this.store.tryExecute.call(this, {'id': ['153', 1], 'left': null, 'right': null, 'origin': null, 'parent': ['_', 0], 'struct': 'Insert', 'parentSub': 'Map', 'opContent': ['153', 0]})
+          yield* this.store.tryExecute.call(this, {'struct': 'Map', 'type': 'Map', 'id': ['153', 0], 'map': {}})
+          yield* this.store.tryExecute.call(this, {'id': ['153', 1], 'left': null, 'right': null, 'origin': null, 'parent': ['_', 0], 'struct': 'Insert', 'parentSub': 'Map', 'opContent': ['153', 0]})
+          yield* this.store.tryExecute.call(this, {'left': null, 'right': null, 'origin': null, 'parent': ['153', 0], 'parentSub': 'somekey', 'struct': 'Insert', 'content': 3784, 'id': ['154', 0]})
+          yield* this.store.tryExecute.call(this, {'left': null, 'right': ['154', 0], 'origin': null, 'parent': ['153', 0], 'parentSub': 'somekey', 'struct': 'Insert', 'content': 8217, 'id': ['154', 1]})
+          yield* this.store.tryExecute.call(this, {'left': null, 'right': ['154', 1], 'origin': null, 'parent': ['153', 0], 'parentSub': 'somekey', 'struct': 'Insert', 'content': 5036, 'id': ['154', 2]})
+          yield* this.store.tryExecute.call(this, {'id': ['153', 2], 'left': null, 'right': null, 'origin': null, 'parent': ['153', 0], 'struct': 'Insert', 'parentSub': 'somekey', 'content': 417})
+          yield* this.store.tryExecute.call(this, {'id': ['155', 0], 'left': null, 'right': null, 'origin': null, 'parent': ['153', 0], 'struct': 'Insert', 'parentSub': 'somekey', 'content': 2202})
+          yield* this.garbageCollectOperation(['153', 2])
+          yield* this.garbageCollectOperation(['154', 0])
+          yield* this.garbageCollectOperation(['154', 1])
+          yield* this.garbageCollectOperation(['154', 2])
+          yield* this.garbageCollectOperation(['155', 0])
+          yield* this.garbageCollectOperation(['156', 0])
+          yield* this.garbageCollectOperation(['157', 0])
+          yield* this.garbageCollectOperation(['157', 1])
+          yield* this.store.tryExecute.call(this, {'id': ['153', 3], 'left': null, 'right': null, 'origin': null, 'parent': ['153', 0], 'struct': 'Insert', 'parentSub': 'somekey', 'content': 4372})
+        })
+        yield wait()
+        yield yconfig3.disconnect()
+        yield yconfig2.disconnect()
+        yield flushAll()
+        wait()
+        yield yconfig3.reconnect()
+        yield yconfig2.reconnect()
+        yield wait()
+        yield flushAll()
+        done()
+      }))
+    })
+    describeManyTimes(repeatArrayTests, `Random tests`, function () {
+      var randomArrayTransactions = [
+        function insert (array) {
+          array.insert(getRandomNumber(array.toArray().length), [getRandomNumber()])
+        },
+        function _delete (array) {
+          var length = array.toArray().length
+          if (length > 0) {
+            array.delete(getRandomNumber(length - 1))
+          }
+        }
+      ]
+      function compareArrayValues (arrays) {
+        var firstArray
+        for (var l of arrays) {
+          var val = l.toArray()
+          if (firstArray == null) {
+            firstArray = val
+          } else {
+            expect(val).toEqual(firstArray)
+          }
+        }
+      }
+      beforeEach(async(function * (done) {
+        yield this.users[0].root.set('Array', Y.Array)
+        yield flushAll()
+
+        var promises = []
+        for (var u = 0; u < this.users.length; u++) {
+          promises.push(this.users[u].root.get('Array'))
+        }
+        this.arrays = yield Promise.all(promises)
+        done()
+      }))
+      it('arrays.length equals users.length', async(function * (done) {
+        expect(this.arrays.length).toEqual(this.users.length)
+        done()
+      }))
+      it(`succeed after ${numberOfYArrayTests} actions, no GC, all users disconnecting/reconnecting`, async(function * (done) {
+        for (var u of this.users) {
+          u.connector.debug = true
+        }
+        yield applyRandomTransactionsAllRejoinNoGC(this.users, this.arrays, randomArrayTransactions, numberOfYArrayTests)
+        yield flushAll()
+        yield compareArrayValues(this.arrays)
+        yield compareAllUsers(this.users)
+        done()
+      }))
+      it(`succeed after ${numberOfYArrayTests} actions, GC, user[0] is not disconnecting`, async(function * (done) {
+        for (var u of this.users) {
+          u.connector.debug = true
+        }
+        yield applyRandomTransactionsWithGC(this.users, this.arrays, randomArrayTransactions, numberOfYArrayTests)
+        yield flushAll()
+        yield compareArrayValues(this.arrays)
+        yield compareAllUsers(this.users)
+        done()
+      }))
+    })
+  })
+}
--- a/src/Types/Map.js
+++ b/src/Types/Map.js
@@ -0,0 +1,295 @@
+/* global Y */
+'use strict'
+
+;(function () {
+  class YMap {
+    constructor (os, model, contents, opContents) {
+      this._model = model.id
+      this.os = os
+      this.map = Y.utils.copyObject(model.map)
+      this.contents = contents
+      this.opContents = opContents
+      this.eventHandler = new Y.utils.EventHandler(ops => {
+        var userEvents = []
+        for (var i in ops) {
+          var op = ops[i]
+          var oldValue
+          // key is the name to use to access (op)content
+          var key = op.struct === 'Delete' ? op.key : op.parentSub
+
+          // compute oldValue
+          if (this.opContents[key] != null) {
+            let prevType = this.opContents[key]
+            oldValue = () => {// eslint-disable-line
+              return new Promise((resolve) => {
+                this.os.requestTransaction(function *() {// eslint-disable-line
+                  resolve(yield* this.getType(prevType))
+                })
+              })
+            }
+          } else {
+            oldValue = this.contents[key]
+          }
+          // compute op event
+          if (op.struct === 'Insert') {
+            if (op.left === null) {
+              if (op.opContent != null) {
+                delete this.contents[key]
+                if (op.deleted) {
+                  delete this.opContents[key]
+                } else {
+                  this.opContents[key] = op.opContent
+                }
+              } else {
+                delete this.opContents[key]
+                if (op.deleted) {
+                  delete this.contents[key]
+                } else {
+                  this.contents[key] = op.content
+                }
+              }
+              this.map[key] = op.id
+              var insertEvent = {
+                name: key,
+                object: this
+              }
+              if (oldValue === undefined) {
+                insertEvent.type = 'add'
+              } else {
+                insertEvent.type = 'update'
+                insertEvent.oldValue = oldValue
+              }
+              userEvents.push(insertEvent)
+            }
+          } else if (op.struct === 'Delete') {
+            if (Y.utils.compareIds(this.map[key], op.target)) {
+              delete this.opContents[key]
+              delete this.contents[key]
+              var deleteEvent = {
+                name: key,
+                object: this,
+                oldValue: oldValue,
+                type: 'delete'
+              }
+              userEvents.push(deleteEvent)
+            }
+          } else {
+            throw new Error('Unexpected Operation!')
+          }
+        }
+        this.eventHandler.callEventListeners(userEvents)
+      })
+    }
+    get (key) {
+      // return property.
+      // if property does not exist, return null
+      // if property is a type, return a promise
+      if (key == null) {
+        throw new Error('You must specify key!')
+      }
+      if (this.opContents[key] == null) {
+        return this.contents[key]
+      } else {
+        return new Promise((resolve) => {
+          var oid = this.opContents[key]
+          this.os.requestTransaction(function *() {
+            resolve(yield* this.getType(oid))
+          })
+        })
+      }
+    }
+    /*
+      If there is a primitive (not a custom type), then return it.
+      Returns all primitive values, if propertyName is specified!
+      Note: modifying the return value could result in inconsistencies!
+        -- so make sure to copy it first!
+    */
+    getPrimitive (key) {
+      if (key == null) {
+        return Y.utils.copyObject(this.contents)
+      } else {
+        return this.contents[key]
+      }
+    }
+    delete (key) {
+      var right = this.map[key]
+      if (right != null) {
+        var del = {
+          target: right,
+          struct: 'Delete'
+        }
+        var eventHandler = this.eventHandler
+        var modDel = Y.utils.copyObject(del)
+        modDel.key = key
+        eventHandler.awaitAndPrematurelyCall([modDel])
+        this.os.requestTransaction(function *() {
+          yield* this.applyCreatedOperations([del])
+          eventHandler.awaitedDeletes(1)
+        })
+      }
+    }
+    set (key, value) {
+      // set property.
+      // if property is a type, return a promise
+      // if not, apply immediately on this type an call event
+
+      var right = this.map[key] || null
+      var insert = {
+        left: null,
+        right: right,
+        origin: null,
+        parent: this._model,
+        parentSub: key,
+        struct: 'Insert'
+      }
+      return new Promise((resolve) => {
+        if (value instanceof Y.utils.CustomType) {
+          // construct a new type
+          this.os.requestTransaction(function *() {
+            var typeid = yield* value.createType.call(this)
+            var type = yield* this.getType(typeid)
+            insert.opContent = typeid
+            insert.id = this.store.getNextOpId()
+            yield* this.applyCreatedOperations([insert])
+            resolve(type)
+          })
+        } else {
+          insert.content = value
+          insert.id = this.os.getNextOpId()
+          var eventHandler = this.eventHandler
+          eventHandler.awaitAndPrematurelyCall([insert])
+
+          this.os.requestTransaction(function *() {
+            yield* this.applyCreatedOperations([insert])
+            eventHandler.awaitedInserts(1)
+          })
+          resolve(value)
+        }
+      })
+    }
+    observe (f) {
+      this.eventHandler.addEventListener(f)
+    }
+    unobserve (f) {
+      this.eventHandler.removeEventListener(f)
+    }
+    /*
+      Observe a path.
+
+      E.g.
+      ```
+      o.set('textarea', Y.TextBind)
+      o.observePath(['textarea'], function(t){
+        // is called whenever textarea is replaced
+        t.bind(textarea)
+      })
+
+      returns a Promise that contains a function that removes the observer from the path.
+    */
+    observePath (path, f) {
+      var self = this
+      function observeProperty (events) {
+        // call f whenever path changes
+        for (var i = 0; i < events.length; i++) {
+          var event = events[i]
+          if (event.name === propertyName) {
+            // call this also for delete events!
+            var property = self.get(propertyName)
+            if (property instanceof Promise) {
+              property.then(f)
+            } else {
+              f(property)
+            }
+          }
+        }
+      }
+
+      if (path.length < 1) {
+        throw new Error('Path must contain at least one element!')
+      } else if (path.length === 1) {
+        var propertyName = path[0]
+        var property = self.get(propertyName)
+        if (property instanceof Promise) {
+          property.then(f)
+        } else {
+          f(property)
+        }
+        this.observe(observeProperty)
+        return Promise.resolve(function () {
+          self.unobserve(f)
+        })
+      } else {
+        var deleteChildObservers
+        var resetObserverPath = function () {
+          var promise = self.get(path[0])
+          if (!promise instanceof Promise) {
+            // its either not defined or a primitive value
+            promise = self.set(path[0], Y.Map)
+          }
+          return promise.then(function (map) {
+            return map.observePath(path.slice(1), f)
+          }).then(function (_deleteChildObservers) {
+            // update deleteChildObservers
+            deleteChildObservers = _deleteChildObservers
+            return Promise.resolve() // Promise does not return anything
+          })
+        }
+        var observer = function (events) {
+          for (var e in events) {
+            var event = events[e]
+            if (event.name === path[0]) {
+              deleteChildObservers()
+              if (event.type === 'add' || event.type === 'update') {
+                resetObserverPath()
+              }
+              // TODO: what about the delete events?
+            }
+          }
+        }
+        self.observe(observer)
+        return resetObserverPath().then(
+          // this promise contains a function that deletes all the child observers
+          // and how to unobserve the observe from this object
+          Promise.resolve(function () {
+            deleteChildObservers()
+            self.unobserve(observer)
+          })
+        )
+      }
+    }
+    * _changed (transaction, op) {
+      if (op.struct === 'Delete') {
+        op.key = (yield* transaction.getOperation(op.target)).parentSub
+      }
+      this.eventHandler.receivedOp(op)
+    }
+  }
+  Y.Map = new Y.utils.CustomType({
+    class: YMap,
+    createType: function * YMapCreator () {
+      var modelid = this.store.getNextOpId()
+      var model = {
+        map: {},
+        struct: 'Map',
+        type: 'Map',
+        id: modelid
+      }
+      yield* this.applyCreatedOperations([model])
+      return modelid
+    },
+    initType: function * YMapInitializer (os, model) {
+      var contents = {}
+      var opContents = {}
+      var map = model.map
+      for (var name in map) {
+        var op = yield* this.getOperation(map[name])
+        if (op.opContent != null) {
+          opContents[name] = op.opContent
+        } else {
+          contents[name] = op.content
+        }
+      }
+      return new YMap(os, model, contents, opContents)
+    }
+  })
+})()
--- a/src/Types/Map.spec.js
+++ b/src/Types/Map.spec.js
@@ -0,0 +1,219 @@
+/* global createUsers, Y, databases, compareAllUsers, getRandomNumber, applyRandomTransactionsAllRejoinNoGC, applyRandomTransactionsWithGC, async, describeManyTimes */
+/* eslint-env browser,jasmine */
+
+var numberOfYMapTests = 40
+var repeatMapTeasts = 2
+
+for (let database of databases) {
+  describe(`Map Type (DB: ${database})`, function () {
+    var y1, y2, y3, y4, flushAll
+
+    beforeEach(async(function * (done) {
+      yield createUsers(this, 5, database)
+      y1 = this.users[0].root
+      y2 = this.users[1].root
+      y3 = this.users[2].root
+      y4 = this.users[3].root
+      flushAll = this.users[0].connector.flushAll
+      done()
+    }))
+    afterEach(async(function * (done) {
+      yield compareAllUsers(this.users)
+      done()
+    }), 5000)
+
+    describe('Basic tests', function () {
+      it('Basic get&set of Map property (converge via sync)', async(function * (done) {
+        y1.set('stuff', 'stuffy')
+        expect(y1.get('stuff')).toEqual('stuffy')
+        yield flushAll()
+        for (var key in this.users) {
+          var u = this.users[key].root
+          expect(u.get('stuff')).toEqual('stuffy')
+        }
+        done()
+      }))
+      it('Map can set custom types (Map)', async(function * (done) {
+        var map = yield y1.set('Map', Y.Map)
+        map.set('one', 1)
+        map = yield y1.get('Map')
+        expect(map.get('one')).toEqual(1)
+        done()
+      }))
+      it('Map can set custom types (Array)', async(function * (done) {
+        var array = yield y1.set('Array', Y.Array)
+        array.insert(0, [1, 2, 3])
+        array = yield y1.get('Array')
+        expect(array.toArray()).toEqual([1, 2, 3])
+        done()
+      }))
+      it('Basic get&set of Map property (converge via update)', async(function * (done) {
+        yield flushAll()
+        y1.set('stuff', 'stuffy')
+        expect(y1.get('stuff')).toEqual('stuffy')
+
+        yield flushAll()
+        for (var key in this.users) {
+          var r = this.users[key].root
+          expect(r.get('stuff')).toEqual('stuffy')
+        }
+        done()
+      }))
+      it('Basic get&set of Map property (handle conflict)', async(function * (done) {
+        yield flushAll()
+        y1.set('stuff', 'c0')
+        y2.set('stuff', 'c1')
+
+        yield flushAll()
+        for (var key in this.users) {
+          var u = this.users[key]
+          expect(u.root.get('stuff')).toEqual('c0')
+        }
+        done()
+      }))
+      it('Basic get&set&delete of Map property (handle conflict)', async(function * (done) {
+        yield flushAll()
+        y1.set('stuff', 'c0')
+        y1.delete('stuff')
+        y2.set('stuff', 'c1')
+        yield flushAll()
+
+        for (var key in this.users) {
+          var u = this.users[key]
+          expect(u.root.get('stuff')).toBeUndefined()
+        }
+        done()
+      }))
+      it('Basic get&set of Map property (handle three conflicts)', async(function * (done) {
+        yield flushAll()
+        y1.set('stuff', 'c0')
+        y2.set('stuff', 'c1')
+        y2.set('stuff', 'c2')
+        y3.set('stuff', 'c3')
+        yield flushAll()
+
+        for (var key in this.users) {
+          var u = this.users[key]
+          expect(u.root.get('stuff')).toEqual('c0')
+        }
+        done()
+      }))
+      it('Basic get&set&delete of Map property (handle three conflicts)', async(function * (done) {
+        yield flushAll()
+        y1.set('stuff', 'c0')
+        y2.set('stuff', 'c1')
+        y2.set('stuff', 'c2')
+        y3.set('stuff', 'c3')
+        yield flushAll()
+        y1.set('stuff', 'deleteme')
+        y1.delete('stuff')
+        y2.set('stuff', 'c1')
+        y3.set('stuff', 'c2')
+        y4.set('stuff', 'c3')
+        yield flushAll()
+
+        for (var key in this.users) {
+          var u = this.users[key]
+          expect(u.root.get('stuff')).toBeUndefined()
+        }
+        done()
+      }))
+      it('observePath properties', async(function * (done) {
+        y1.observePath(['map'], function (map) {
+          if (map != null) {
+            map.set('yay', 4)
+          }
+        })
+        yield y2.set('map', Y.Map)
+        yield flushAll()
+        var map = yield y3.get('map')
+        expect(map.get('yay')).toEqual(4)
+        done()
+      }))
+      it('throws add & update & delete events (with type and primitive content)', async(function * (done) {
+        var event
+        yield flushAll()
+        y1.observe(function (e) {
+          event = e // just put it on event, should be thrown synchronously anyway
+        })
+        y1.set('stuff', 4)
+        expect(event).toEqual([{
+          type: 'add',
+          object: y1,
+          name: 'stuff'
+        }])
+        // update, oldValue is in contents
+        yield y1.set('stuff', Y.Array)
+        expect(event).toEqual([{
+          type: 'update',
+          object: y1,
+          name: 'stuff',
+          oldValue: 4
+        }])
+        y1.get('stuff').then(function (replacedArray) {
+          // update, oldValue is in opContents
+          y1.set('stuff', 5)
+          var getYArray = event[0].oldValue
+          expect(typeof getYArray.constructor === 'function').toBeTruthy()
+          getYArray().then(function (array) {
+            expect(array).toEqual(replacedArray)
+
+            // delete
+            y1.delete('stuff')
+            expect(event).toEqual([{
+              type: 'delete',
+              name: 'stuff',
+              object: y1,
+              oldValue: 5
+            }])
+            done()
+          })
+        })
+      }))
+    })
+    describeManyTimes(repeatMapTeasts, `${numberOfYMapTests} Random tests`, function () {
+      var randomMapTransactions = [
+        function set (map) {
+          map.set('somekey', getRandomNumber())
+        },
+        function delete_ (map) {
+          map.delete('somekey')
+        }
+      ]
+      function compareMapValues (maps) {
+        var firstMap
+        for (var map of maps) {
+          var val = map.getPrimitive()
+          if (firstMap == null) {
+            firstMap = val
+          } else {
+            expect(val).toEqual(firstMap)
+          }
+        }
+      }
+      beforeEach(async(function * (done) {
+        yield y1.set('Map', Y.Map)
+        yield flushAll()
+
+        var promises = []
+        for (var u = 0; u < this.users.length; u++) {
+          promises.push(this.users[u].root.get('Map'))
+        }
+        this.maps = yield Promise.all(promises)
+        done()
+      }))
+      it(`succeed after ${numberOfYMapTests} actions, no GC, all users disconnecting/reconnecting`, async(function * (done) {
+        yield applyRandomTransactionsAllRejoinNoGC(this.users, this.maps, randomMapTransactions, numberOfYMapTests)
+        yield flushAll()
+        yield compareMapValues(this.maps)
+        done()
+      }))
+      it(`succeed after ${numberOfYMapTests} actions, GC, user[0] is not disconnecting`, async(function * (done) {
+        yield applyRandomTransactionsWithGC(this.users, this.maps, randomMapTransactions, numberOfYMapTests)
+        yield flushAll()
+        yield compareMapValues(this.maps)
+        done()
+      }))
+    })
+  })
+}
--- a/src/Types/TextBind.js
+++ b/src/Types/TextBind.js
@@ -0,0 +1,290 @@
+/* global Y */
+'use strict'
+
+;(function () {
+  class YTextBind extends Y.Array['class'] {
+    constructor (os, _model, idArray, valArray) {
+      super(os, _model, idArray, valArray)
+      this.textfields = []
+    }
+    toString () {
+      return this.valArray.join('')
+    }
+    insert (pos, content) {
+      super.insert(pos, content.split(''))
+    }
+    bind (textfield, domRoot) {
+      domRoot = domRoot || window; // eslint-disable-line
+      if (domRoot.getSelection == null) {
+        domRoot = window;// eslint-disable-line
+      }
+
+      // don't duplicate!
+      for (var t in this.textfields) {
+        if (this.textfields[t] === textfield) {
+          return
+        }
+      }
+      var creatorToken = false
+
+      var word = this
+      textfield.value = this.toString()
+      this.textfields.push(textfield)
+      var createRange, writeRange, writeContent
+      if (textfield.selectionStart != null && textfield.setSelectionRange != null) {
+        createRange = function (fix) {
+          var left = textfield.selectionStart
+          var right = textfield.selectionEnd
+          if (fix != null) {
+            left = fix(left)
+            right = fix(right)
+          }
+          return {
+            left: left,
+            right: right
+          }
+        }
+        writeRange = function (range) {
+          writeContent(word.toString())
+          textfield.setSelectionRange(range.left, range.right)
+        }
+        writeContent = function (content) {
+          textfield.value = content
+        }
+      } else {
+        createRange = function (fix) {
+          var range = {}
+          var s = domRoot.getSelection()
+          var clength = textfield.textContent.length
+          range.left = Math.min(s.anchorOffset, clength)
+          range.right = Math.min(s.focusOffset, clength)
+          if (fix != null) {
+            range.left = fix(range.left)
+            range.right = fix(range.right)
+          }
+          var editedElement = s.focusNode
+          if (editedElement === textfield || editedElement === textfield.childNodes[0]) {
+            range.isReal = true
+          } else {
+            range.isReal = false
+          }
+          return range
+        }
+
+        writeRange = function (range) {
+          writeContent(word.toString())
+          var textnode = textfield.childNodes[0]
+          if (range.isReal && textnode != null) {
+            if (range.left < 0) {
+              range.left = 0
+            }
+            range.right = Math.max(range.left, range.right)
+            if (range.right > textnode.length) {
+              range.right = textnode.length
+            }
+            range.left = Math.min(range.left, range.right)
+            var r = document.createRange(); // eslint-disable-line
+            r.setStart(textnode, range.left)
+            r.setEnd(textnode, range.right)
+            var s = window.getSelection(); // eslint-disable-line
+            s.removeAllRanges()
+            s.addRange(r)
+          }
+        }
+        writeContent = function (content) {
+          var contentArray = content.replace(new RegExp('\n', 'g'), ' ').split(' ');// eslint-disable-line
+          textfield.innerText = ''
+          for (var i in contentArray) {
+            var c = contentArray[i]
+            textfield.innerText += c
+            if (i !== contentArray.length - 1) {
+              textfield.innerHTML += '&nbsp;'
+            }
+          }
+        }
+      }
+      writeContent(this.toString())
+
+      this.observe(function (events) {
+        for (var e in events) {
+          var event = events[e]
+          if (!creatorToken) {
+            var oPos, fix
+            if (event.type === 'insert') {
+              oPos = event.index
+              fix = function (cursor) {// eslint-disable-line
+                if (cursor <= oPos) {
+                  return cursor
+                } else {
+                  cursor += 1
+                  return cursor
+                }
+              }
+              var r = createRange(fix)
+              writeRange(r)
+            } else if (event.type === 'delete') {
+              oPos = event.index
+              fix = function (cursor) {// eslint-disable-line
+                if (cursor < oPos) {
+                  return cursor
+                } else {
+                  cursor -= 1
+                  return cursor
+                }
+              }
+              r = createRange(fix)
+              writeRange(r)
+            }
+          }
+        }
+      })
+      // consume all text-insert changes.
+      textfield.onkeypress = function (event) {
+        if (word.is_deleted) {
+          // if word is deleted, do not do anything ever again
+          textfield.onkeypress = null
+          return true
+        }
+        creatorToken = true
+        var char
+        if (event.keyCode === 13) {
+          char = '\n'
+        } else if (event.key != null) {
+          if (event.charCode === 32) {
+            char = ' '
+          } else {
+            char = event.key
+          }
+        } else {
+          char = window.String.fromCharCode(event.keyCode); // eslint-disable-line
+        }
+        if (char.length > 1) {
+          return true
+        } else if (char.length > 0) {
+          var r = createRange()
+          var pos = Math.min(r.left, r.right, word.length)
+          var diff = Math.abs(r.right - r.left)
+          word.delete(pos, diff)
+          word.insert(pos, char)
+          r.left = pos + char.length
+          r.right = r.left
+          writeRange(r)
+        }
+        event.preventDefault()
+        creatorToken = false
+        return false
+      }
+      textfield.onpaste = function (event) {
+        if (word.is_deleted) {
+          // if word is deleted, do not do anything ever again
+          textfield.onpaste = null
+          return true
+        }
+        event.preventDefault()
+      }
+      textfield.oncut = function (event) {
+        if (word.is_deleted) {
+          // if word is deleted, do not do anything ever again
+          textfield.oncut = null
+          return true
+        }
+        event.preventDefault()
+      }
+      //
+      // consume deletes. Note that
+      //   chrome: won't consume deletions on keypress event.
+      //   keyCode is deprecated. BUT: I don't see another way.
+      //     since event.key is not implemented in the current version of chrome.
+      //     Every browser supports keyCode. Let's stick with it for now..
+      //
+      textfield.onkeydown = function (event) {
+        creatorToken = true
+        if (word.is_deleted) {
+          // if word is deleted, do not do anything ever again
+          textfield.onkeydown = null
+          return true
+        }
+        var r = createRange()
+        var pos = Math.min(r.left, r.right, word.toString().length)
+        var diff = Math.abs(r.left - r.right)
+        if (event.keyCode != null && event.keyCode === 8) { // Backspace
+          if (diff > 0) {
+            word.delete(pos, diff)
+            r.left = pos
+            r.right = pos
+            writeRange(r)
+          } else {
+            if (event.ctrlKey != null && event.ctrlKey) {
+              var val = word.toString()
+              var newPos = pos
+              var delLength = 0
+              if (pos > 0) {
+                newPos--
+                delLength++
+              }
+              while (newPos > 0 && val[newPos] !== ' ' && val[newPos] !== '\n') {
+                newPos--
+                delLength++
+              }
+              word.delete(newPos, pos - newPos)
+              r.left = newPos
+              r.right = newPos
+              writeRange(r)
+            } else {
+              if (pos > 0) {
+                word.delete(pos - 1, 1)
+                r.left = pos - 1
+                r.right = pos - 1
+                writeRange(r)
+              }
+            }
+          }
+          event.preventDefault()
+          creatorToken = false
+          return false
+        } else if (event.keyCode != null && event.keyCode === 46) { // Delete
+          if (diff > 0) {
+            word.delete(pos, diff)
+            r.left = pos
+            r.right = pos
+            writeRange(r)
+          } else {
+            word.delete(pos, 1)
+            r.left = pos
+            r.right = pos
+            writeRange(r)
+          }
+          event.preventDefault()
+          creatorToken = false
+          return false
+        } else {
+          creatorToken = false
+          return true
+        }
+      }
+    }
+  }
+  Y.TextBind = new Y.utils.CustomType({
+    class: YTextBind,
+    createType: function * YTextBindCreator () {
+      var modelid = this.store.getNextOpId()
+      var model = {
+        start: null,
+        end: null,
+        struct: 'List',
+        type: 'TextBind',
+        id: modelid
+      }
+      yield* this.applyCreatedOperations([model])
+      return modelid
+    },
+    initType: function * YTextBindInitializer (os, model) {
+      var valArray = []
+      var idArray = yield* Y.Struct.List.map.call(this, model, function (c) {
+        valArray.push(c.content)
+        return JSON.stringify(c.id)
+      })
+      return new YTextBind(os, model.id, idArray, valArray)
+    }
+  })
+})()
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -0,0 +1,198 @@
+/* global Y */
+'use strict'
+
+/*
+  EventHandler is an helper class for constructing custom types.
+
+  Why: When constructing custom types, you sometimes want your types to work
+  synchronous: E.g.
+  ``` Synchronous
+  mytype.setSomething("yay")
+  mytype.getSomething() === "yay"
+  ```
+  ``` Asynchronous
+  mytype.setSomething("yay")
+  mytype.getSomething() === undefined
+  mytype.waitForSomething().then(function(){
+    mytype.getSomething() === "yay"
+  })
+
+  The structures usually work asynchronously (you have to wait for the
+  database request to finish). EventHandler will help you to make your type
+  synchronously.
+*/
+class EventHandler {
+  /*
+    onevent: is called when the structure changes.
+
+    Note: "awaiting opertations" is used to denote operations that were
+    prematurely called. Events for received operations can not be executed until
+    all prematurely called operations were executed ("waiting operations")
+  */
+  constructor (onevent) {
+    this.waiting = []
+    this.awaiting = 0
+    this.onevent = onevent
+    this.eventListeners = []
+  }
+  /*
+    Call this when a new operation arrives. It will be executed right away if
+    there are no waiting operations, that you prematurely executed
+  */
+  receivedOp (op) {
+    if (this.awaiting <= 0) {
+      this.onevent([op])
+    } else {
+      this.waiting.push(Y.utils.copyObject(op))
+    }
+  }
+  /*
+    You created some operations, and you want the `onevent` function to be
+    called right away. Received operations will not be executed untill all
+    prematurely called operations are executed
+  */
+  awaitAndPrematurelyCall (ops) {
+    this.awaiting++
+    this.onevent(ops)
+  }
+  /*
+    Basic event listener boilerplate...
+    TODO: maybe put this in a different type..
+  */
+  addEventListener (f) {
+    this.eventListeners.push(f)
+  }
+  removeEventListener (f) {
+    this.eventListeners = this.eventListeners.filter(function (g) {
+      return f !== g
+    })
+  }
+  removeAllEventListeners () {
+    this.eventListeners = []
+  }
+  callEventListeners (event) {
+    for (var i in this.eventListeners) {
+      try {
+        this.eventListeners[i](event)
+      } catch (e) {
+        console.log('User events must not throw Errors!') // eslint-disable-line
+      }
+    }
+  }
+  /*
+    Call this when you successfully awaited the execution of n Insert operations
+  */
+  awaitedInserts (n) {
+    var ops = this.waiting.splice(this.waiting.length - n)
+    for (var oid = 0; oid < ops.length; oid++) {
+      var op = ops[oid]
+      for (var i = this.waiting.length - 1; i >= 0; i--) {
+        let w = this.waiting[i]
+        if (Y.utils.compareIds(op.left, w.id)) {
+          // include the effect of op in w
+          w.right = op.id
+          // exclude the effect of w in op
+          op.left = w.left
+        } else if (Y.utils.compareIds(op.right, w.id)) {
+          // similar..
+          w.left = op.id
+          op.right = w.right
+        }
+      }
+    }
+    this._tryCallEvents()
+  }
+  /*
+    Call this when you successfully awaited the execution of n Delete operations
+  */
+  awaitedDeletes (n, newLeft) {
+    var ops = this.waiting.splice(this.waiting.length - n)
+    for (var j in ops) {
+      var del = ops[j]
+      if (newLeft != null) {
+        for (var i in this.waiting) {
+          let w = this.waiting[i]
+          // We will just care about w.left
+          if (Y.utils.compareIds(del.target, w.left)) {
+            del.left = newLeft
+          }
+        }
+      }
+    }
+    this._tryCallEvents()
+  }
+  /* (private)
+    Try to execute the events for the waiting operations
+  */
+  _tryCallEvents () {
+    this.awaiting--
+    if (this.awaiting <= 0 && this.waiting.length > 0) {
+      var events = this.waiting
+      this.waiting = []
+      this.onevent(events)
+    }
+  }
+}
+Y.utils.EventHandler = EventHandler
+
+/*
+  A wrapper for the definition of a custom type.
+  Every custom type must have three properties:
+
+  * createType
+    - Defines the model of a newly created custom type and returns the type
+  * initType
+    - Given a model, creates a custom type
+  * class
+    - the constructor of the custom type (e.g. in order to inherit from a type)
+*/
+class CustomType { // eslint-disable-line
+  constructor (def) {
+    if (def.createType == null ||
+      def.initType == null ||
+      def.class == null
+    ) {
+      throw new Error('Custom type was not initialized correctly!')
+    }
+    this.createType = def.createType
+    this.initType = def.initType
+    this.class = def.class
+  }
+}
+Y.utils.CustomType = CustomType
+
+/*
+  Make a flat copy of an object
+  (just copy properties)
+*/
+function copyObject (o) {
+  var c = {}
+  for (var key in o) {
+    c[key] = o[key]
+  }
+  return c
+}
+Y.utils.copyObject = copyObject
+
+/*
+  Defines a smaller relation on Id's
+*/
+function smaller (a, b) {
+  return a[0] < b[0] || (a[0] === b[0] && a[1] < b[1])
+}
+Y.utils.smaller = smaller
+
+function compareIds (id1, id2) {
+  if (id1 == null || id2 == null) {
+    if (id1 == null && id2 == null) {
+      return true
+    }
+    return false
+  }
+  if (id1[0] === id2[0] && id1[1] === id2[1]) {
+    return true
+  } else {
+    return false
+  }
+}
+Y.utils.compareIds = compareIds
--- a/src/y.js
+++ b/src/y.js
@@ -0,0 +1,53 @@
+/* @flow */
+'use strict'
+
+function Y (opts) {
+  return new Promise(function (resolve) {
+    var yconfig = new YConfig(opts, function () {
+      yconfig.db.whenUserIdSet(function () {
+        resolve(yconfig)
+      })
+    })
+  })
+}
+
+class YConfig {
+  constructor (opts, callback) {
+    this.db = new Y[opts.db.name](this, opts.db)
+    this.connector = new Y[opts.connector.name](this, opts.connector)
+    this.db.requestTransaction(function * requestTransaction () {
+      // create initial Map type
+      var model = {
+        id: ['_', 0],
+        struct: 'Map',
+        type: 'Map',
+        map: {}
+      }
+      yield* this.store.tryExecute.call(this, model)
+      var root = yield* this.getType(model.id)
+      this.store.y.root = root
+      callback()
+    })
+  }
+  isConnected () {
+    return this.connector.isSynced
+  }
+  disconnect () {
+    return this.connector.disconnect()
+  }
+  reconnect () {
+    return this.connector.reconnect()
+  }
+  destroy () {
+    this.disconnect()
+    this.db.destroy()
+    this.connector = null
+    this.db = null
+  }
+}
+
+if (typeof YConcurrency_TestingMode !== 'undefined') {
+  g.Y = Y //eslint-disable-line
+  // debugger //eslint-disable-line
+}
+Y.utils = {}
--- a/test/TestSuite.coffee
+++ b/test/TestSuite.coffee
@@ -1,219 +0,0 @@
-chai      = require('chai')
-expect    = chai.expect
-sinon     = require('sinon')
-sinonChai = require('sinon-chai')
-_         = require("underscore")
-
-chai.use(sinonChai)
-
-Connector = require "../../y-test/lib/y-test.coffee"
-Y = null # need global reference!
-
-module.exports = class Test
-  constructor: (@name_suffix = "", Yjs)->
-    Y = Yjs
-    @number_of_test_cases_multiplier = 1
-    @repeat_this = 1 * @number_of_test_cases_multiplier
-    @doSomething_amount = 123 * @number_of_test_cases_multiplier
-    @number_of_engines = 5 + @number_of_test_cases_multiplier - 1
-
-    @time = 0 # denotes to the time when run was started
-    @ops = 0 # number of operations (used with @time)
-    @time_now = 0 # current time
-    @max_depth = 3
-
-    @debug = false
-
-    @reinitialize()
-    for gf in @getGeneratingFunctions(0)
-      if not (gf.types? and gf.f?)
-        throw new Error "Generating Functions are not initialized properly!"
-      for t in gf.types
-        if not t?
-          throw new Error "You havent includedt this type in Y (do require 'y-whatever')"
-
-  reinitialize: ()->
-    @users = []
-    for i in [0...@number_of_engines]
-      u = @makeNewUser (i+@name_suffix)
-      for user in @users
-        u._model.connector.join(user._model.connector) # TODO: change the test-connector to make this more convenient
-      @users.push u
-    @initUsers?(@users[0])
-    @flushAll()
-
-  # is called by implementing class
-  makeNewUser: (user)->
-    user._model.HB.stopGarbageCollection()
-    user
-
-  getSomeUser: ()->
-    i = _.random 0, (@users.length-1)
-    @users[i]
-
-  getRandomText: (chars, min_length = 0)->
-    chars ?= "abcdefghijklmnopqrstuvwxyz"
-    length = _.random min_length, 10
-    #length = 1
-    nextchar = chars[(_.random 0, (chars.length-1))]
-    text = ""
-    _(length).times ()-> text += nextchar
-    text
-
-  getRandomObject: ()->
-    result = {}
-    key1 = @getRandomKey()
-    key2 = @getRandomKey()
-    val1 = @getRandomText()
-    val2 = null
-    if _.random(0,1) is 1
-      val2 = @getRandomObject()
-    else
-      val2 = @getRandomText()
-    result[key1] = val1
-    result[key2] = val2
-    result
-
-  getRandomKey: ()->
-    @getRandomText [1,2,'x','y'], 1 # only 4 keys
-
-  getGeneratingFunctions: (user_num)=>
-    types = @users[user_num]._model.operations
-    []
-  getRandomRoot: (user_num)->
-    throw new Error "implement me!"
-
-  compare: (o1, o2, depth = (@max_depth+1))->
-    if o1 is o2 or depth <= 0
-      true
-    else if o1._name? and o1._name isnt o2._name
-      throw new Error "different types"
-    else if o1._model?
-      @compare o1._model, o2._model, depth
-    else if o1.type is "MapManager"
-      for name, val of o1.val()
-        @compare(val, o2.val(name), depth-1)
-    else if o1.type is "ListManager"
-      for val,i in o1.val()
-        @compare(val, o2.val(i), depth-1)
-    else if o1.constructor is Array and o2.constructor is Array
-      if o1.length isnt o2.length
-        throw new Error "The Arrays do not have the same size!"
-      for o,i in o1
-        @compare o, o2[i], (depth-1)
-    else if o1 isnt o2
-      throw new Error "different values"
-    else
-      throw new Error "I don't know what to do .. "
-
-  generateRandomOp: (user_num)=>
-    y = @getRandomRoot(user_num)
-    choices = @getGeneratingFunctions(user_num).filter (gf)->
-      _.some gf.types, (type)->
-        y instanceof type
-
-    if choices.length is 0
-      console.dir(y)
-      throw new Error "You forgot to specify a test generation methot for this Operation! (#{y.type})"
-    i = _.random 0, (choices.length-1)
-    choices[i].f y
-
-  applyRandomOp: (user_num)=>
-    user = @users[user_num]
-    user._model.connector.flushOneRandom()
-
-  doSomething: ()->
-    user_num = _.random (@number_of_engines-1)
-    choices = [@applyRandomOp, @generateRandomOp]
-    choice = _.random (choices.length-1)
-    choices[choice](user_num)
-
-  flushAll: (final)->
-    # TODO:!!
-    final = false
-    if @users.length <= 1 or not final
-      for user,user_number in @users
-        user._model.connector.flushAll()
-    else
-      for user,user_number in @users[1..]
-        user._model.connector.flushAll()
-      ops = @users[1].getHistoryBuffer()._encode @users[0].HB.getOperationCounter()
-      @users[0].engine.applyOpsCheckDouble ops
-
-
-  compareAll: (test_number)->
-    @flushAll(true)
-
-    @time += (new Date()).getTime() - @time_now
-
-    number_of_created_operations = 0
-    for i in [0...(@users.length)]
-      number_of_created_operations += @users[i]._model.connector.getOpsInExecutionOrder().length
-    @ops += number_of_created_operations*@users.length
-
-    ops_per_msek = Math.floor(@ops/@time)
-    if test_number? # and @debug
-      console.log "#{test_number}/#{@repeat_this}: #{number_of_created_operations} were created and applied on (#{@users.length}) users ops in a different order." + " Over all we consumed #{@ops} operations in #{@time/1000} seconds (#{ops_per_msek} ops/msek)."
-
-    for i in [0...(@users.length-1)]
-      if @debug
-        if not _.isEqual @getContent(i), @getContent(i+1)
-          printOpsInExecutionOrder = (otnumber, otherotnumber)=>
-            ops = _.filter @users[otnumber]._model.connector.getOpsInExecutionOrder(), (o)->
-              typeof o.uid.op_name isnt 'string' and o.uid.creator isnt '_'
-            for s,j in ops
-              console.log "op#{j} = " + (JSON.stringify s)
-            console.log ""
-            s = "ops = ["
-            for o,j in ops
-              if j isnt 0
-                s += ", "
-              s += "op#{j}"
-            s += "]"
-            console.log s
-            console.log "@test_user.engine.applyOps ops"
-            console.log "expect(@test_user.val('name').val()).to.equal(\"#{@users[otherotnumber].val('name').val()}\")"
-            ops
-          console.log ""
-          console.log "Found an OT Puzzle!"
-          console.log "OT states:"
-          for u,j in @users
-            console.log "OT#{j}: "+u.val('name').val()
-          console.log "\nOT execution order (#{i},#{i+1}):"
-          printOpsInExecutionOrder i, i+1
-          console.log ""
-          ops = printOpsInExecutionOrder i+1, i
-
-          console.log ""
-      expect(@compare(@users[i], @users[i+1])).to.not.be.undefined
-
-  run: ()->
-    if @debug
-      console.log ''
-    for times in [1..@repeat_this]
-      @time_now = (new Date).getTime()
-      for i in [1..Math.floor(@doSomething_amount/2)]
-        @doSomething()
-      @flushAll(false)
-      for u in @users
-        u._model.HB.emptyGarbage()
-      for i in [1..Math.floor(@doSomething_amount/2)]
-        @doSomething()
-
-      @compareAll(times)
-      @testHBencoding()
-      if times isnt @repeat_this
-        @reinitialize()
-
-  testHBencoding: ()->
-    # in case of JsonFramework, every user will create its JSON first! therefore, the testusers id must be small than all the others (see InsertType)
-    @users[@users.length] = @makeNewUser (-1) # this does not want to join with anymody
-
-    @users[@users.length-1]._model.HB.renewStateVector @users[0]._model.HB.getOperationCounter()
-    @users[@users.length-1]._model.engine.applyOps @users[0]._model.HB._encode()
-
-    #if @getContent(@users.length-1) isnt @getContent(0)
-    #  console.log "testHBencoding:"
-    #  console.log "Unprocessed ops first: #{@users[0].engine.unprocessed_ops.length}"
-    #  console.log "Unprocessed ops last: #{@users[@users.length-1].engine.unprocessed_ops.length}"
-    expect(@compare(@users[@users.length-1], @users[0])).to.not.be.undefined
--- a/test/object-test.coffee
+++ b/test/object-test.coffee
@@ -1,324 +0,0 @@
-chai      = require('chai')
-expect    = chai.expect
-should    = chai.should()
-sinon     = require('sinon')
-sinonChai = require('sinon-chai')
-_         = require("underscore")
-
-chai.use(sinonChai)
-
-Y = require "../lib/y.coffee"
-Y.Test = require "../../y-test/lib/y-test.coffee"
-Y.Text = require "../../y-text/lib/y-text"
-Y.List = require "../../y-list/lib/y-list"
-
-TestSuite = require "./TestSuite"
-class ObjectTest extends TestSuite
-
-  constructor: (suffix)->
-    super suffix, Y
-
-  makeNewUser: (userId)->
-    conn = new Y.Test userId
-    super new Y conn
-
-  type: "ObjectTest"
-
-  getRandomRoot: (user_num, root, depth = @max_depth)->
-    root ?= @users[user_num]
-    if depth is 0 or _.random(0,1) is 1 # take root
-      root
-    else # take child
-      depth--
-      elems = null
-      if root._name is "Object"
-        elems =
-          for oname,val of root.val()
-            val
-      else if root._name is "Array"
-        elems = root.val()
-      else
-        return root
-
-      elems = elems.filter (elem)->
-        elem? and ((elem._name is "Array") or (elem._name is "Object"))
-      if elems.length is 0
-        root
-      else
-        p = elems[_.random(0, elems.length-1)]
-        @getRandomRoot user_num, p, depth
-
-  getGeneratingFunctions: (user_num)->
-    super(user_num).concat [
-        f : (y)=> # Delete Object Property
-          list = for name, o of y.val()
-            name
-          if list.length > 0
-            key = list[_.random(0,list.length-1)]
-            y.delete(key)
-        types: [Y.Object]
-      ,
-        f : (y)=> # SET Object Property
-          y.val(@getRandomKey(), new Y.Object(@getRandomObject()))
-        types: [Y.Object]
-      ,
-        f : (y)=> # SET PROPERTY TEXT
-          y.val(@getRandomKey(), new Y.Text(@getRandomText()))
-        types: [Y.Object]
-      ,
-        f : (y)=> # SET PROPERTY List
-          y.val(@getRandomKey(), new Y.List(@getRandomText().split("")))
-        types: [Y.Object]
-      ,
-        f : (y)=> # Delete Array Element
-          list = y.val()
-          if list.length > 0
-            i = _.random(0,list.length-1)
-            y.delete(i)
-        types: [Y.List]
-      ,
-        f : (y)=> # insert Object mutable
-          l = y.val().length
-          y.insert(_.random(0, l-1), new Y.Object(@getRandomObject()))
-        types: [Y.List]
-      ,
-        f : (y)=> # insert Text mutable
-          l = y.val().length
-          y.insert(_.random(0, l-1), new Y.Text(@getRandomText()))
-        types : [Y.List]
-      ,
-        f : (y)=> # insert List mutable
-          l = y.val().length
-          y.insert(_.random(0, l-1), new Y.List(@getRandomText().split("")))
-        types : [Y.List]
-      ,
-        f : (y)=> # insert Number (primitive object)
-          l = y.val().length
-          y.insert(_.random(0,l-1), _.random(0,42))
-        types : [Y.List]
-      ,
-        f : (y)=> # SET Object Property (circular)
-          y.val(@getRandomKey(), @getRandomRoot user_num)
-        types: [Y.Object]
-      ,
-        f : (y)=> # insert Object mutable (circular)
-          l = y.val().length
-          y.insert(_.random(0, l-1), @getRandomRoot user_num)
-        types: [Y.List]
-      ,
-        f : (y)=> # INSERT TEXT
-          y
-          pos = _.random 0, (y.val().length-1)
-          y.insert pos, @getRandomText()
-          null
-        types: [Y.Text]
-      ,
-        f : (y)-> # DELETE TEXT
-          if y.val().length > 0
-            pos = _.random 0, (y.val().length-1) # TODO: put here also arbitrary number (test behaviour in error cases)
-            length = _.random 0, (y.val().length - pos)
-            ops1 = y.delete pos, length
-          undefined
-        types : [Y.Text]
-      ]
-
-module.exports = ObjectTest
-
-describe "Object Test", ->
-  @timeout 500000
-
-  beforeEach (done)->
-    @yTest = new ObjectTest()
-    @users = @yTest.users
-
-    @test_user = @yTest.makeNewUser "test_user"
-    done()
-
-  it "can handle many engines, many operations, concurrently (random)", ->
-    console.log "" # TODO
-    @yTest.run()
-
-  it "has a working test suite", ->
-    @yTest.compareAll()
-
-  it "handles double-late-join", ->
-    test = new ObjectTest("double")
-    test.run()
-    @yTest.run()
-    u1 = test.users[0]
-    u2 = @yTest.users[1]
-    ops1 = u1._model.HB._encode()
-    ops2 = u2._model.HB._encode()
-    u1._model.engine.applyOp ops2, true
-    u2._model.engine.applyOp ops1, true
-
-    expect(@yTest.compare(u1, u2)).to.not.be.undefined
-
-  it "can handle creaton of complex json (1)", ->
-    @yTest.users[0].val('a', new Y.Text('q'))
-    @yTest.users[1].val('a', new Y.Text('t'))
-    @yTest.compareAll()
-    q = @yTest.users[2].val('a')
-    q.insert(0,'A')
-    @yTest.compareAll()
-    expect(@yTest.getSomeUser().val("a").val()).to.equal("At")
-
-  it "can handle creaton of complex json (2)", ->
-    @yTest.getSomeUser().val('x', new Y.Object({'a':'b'}))
-    @yTest.getSomeUser().val('a', new Y.Object({'a':{q: new Y.Text("dtrndtrtdrntdrnrtdnrtdnrtdnrtdnrdnrdt")}}))
-    @yTest.getSomeUser().val('b', new Y.Object({'a':{}}))
-    @yTest.getSomeUser().val('c', new Y.Object({'a':'c'}))
-    @yTest.getSomeUser().val('c', new Y.Object({'a':'b'}))
-    @yTest.compareAll()
-    q = @yTest.getSomeUser().val("a").val("a").val("q")
-    q.insert(0,'A')
-    @yTest.compareAll()
-    expect(@yTest.getSomeUser().val("a").val("a").val("q").val()).to.equal("Adtrndtrtdrntdrnrtdnrtdnrtdnrtdnrdnrdt")
-
-  it "can handle creaton of complex json (3)", ->
-    @yTest.users[0].val('l', new Y.List([1,2,3]))
-    @yTest.users[1].val('l', new Y.List([4,5,6]))
-    @yTest.compareAll()
-    @yTest.users[2].val('l').insert(0,'A')
-    w = @yTest.users[1].val('l').insert(0,new Y.Text('B')).val(0)
-    w.insert 1, "C"
-    expect(w.val()).to.equal("BC")
-    @yTest.compareAll()
-
-  it "handles immutables and primitive data types", ->
-    @yTest.getSomeUser().val('string', "text")
-    @yTest.getSomeUser().val('number', 4)
-    @yTest.getSomeUser().val('object', new Y.Object({q:"rr"}))
-    @yTest.getSomeUser().val('null', null)
-    @yTest.compareAll()
-    expect(@yTest.getSomeUser().val('string')).to.equal "text"
-    expect(@yTest.getSomeUser().val('number')).to.equal 4
-    expect(@yTest.getSomeUser().val('object').val('q')).to.equal "rr"
-    expect(@yTest.getSomeUser().val('null') is null).to.be.ok
-
-  it "handles immutables and primitive data types (2)", ->
-    @yTest.users[0].val('string', "text")
-    @yTest.users[1].val('number', 4)
-    @yTest.users[2].val('object', new Y.Object({q:"rr"}))
-    @yTest.users[0].val('null', null)
-    @yTest.compareAll()
-    expect(@yTest.getSomeUser().val('string')).to.equal "text"
-    expect(@yTest.getSomeUser().val('number')).to.equal 4
-    expect(@yTest.getSomeUser().val('object').val('q')).to.equal "rr"
-    expect(@yTest.getSomeUser().val('null') is null).to.be.ok
-
-  it "Observers work on JSON Types (add type observers, local and foreign)", ->
-    u = @yTest.users[0]
-    @yTest.flushAll()
-    last_task = null
-    observer1 = (changes)->
-      expect(changes.length).to.equal(1)
-      change = changes[0]
-      expect(change.type).to.equal("add")
-      expect(change.object).to.equal(u)
-      expect(change.changedBy).to.equal('0')
-      expect(change.name).to.equal("newStuff")
-      last_task = "observer1"
-    u.observe observer1
-    u.val("newStuff",new Y.Text("someStuff"))
-    expect(last_task).to.equal("observer1")
-    u.unobserve observer1
-
-    observer2 = (changes)->
-      expect(changes.length).to.equal(1)
-      change = changes[0]
-      expect(change.type).to.equal("add")
-      expect(change.object).to.equal(u)
-      expect(change.changedBy).to.equal('1')
-      expect(change.name).to.equal("moreStuff")
-      last_task = "observer2"
-    u.observe observer2
-    v = @yTest.users[1]
-    v.val("moreStuff","someMoreStuff")
-    @yTest.flushAll()
-    expect(last_task).to.equal("observer2")
-    u.unobserve observer2
-
-  it "Observers work on JSON Types (update type observers, local and foreign)", ->
-    u = @yTest.users[0].val("newStuff", new Y.Text("oldStuff")).val("moreStuff",new Y.Text("moreOldStuff"))
-    @yTest.flushAll()
-    last_task = null
-    observer1 = (changes)->
-      expect(changes.length).to.equal(1)
-      change = changes[0]
-      expect(change.type).to.equal("update")
-      expect(change.object).to.equal(u)
-      expect(change.changedBy).to.equal('0')
-      expect(change.name).to.equal("newStuff")
-      expect(change.oldValue.val()).to.equal("oldStuff")
-      last_task = "observer1"
-    u.observe observer1
-    u.val("newStuff","someStuff")
-    expect(last_task).to.equal("observer1")
-    u.unobserve observer1
-
-    observer2 = (changes)->
-      expect(changes.length).to.equal(1)
-      change = changes[0]
-      expect(change.type).to.equal("update")
-      expect(change.object).to.equal(u)
-      expect(change.changedBy).to.equal('1')
-      expect(change.name).to.equal("moreStuff")
-      expect(change.oldValue.val()).to.equal("moreOldStuff")
-      last_task = "observer2"
-    u.observe observer2
-    v = @yTest.users[1]
-    v.val("moreStuff","someMoreStuff")
-    @yTest.flushAll()
-    expect(last_task).to.equal("observer2")
-    u.unobserve observer2
-
-
-  it "Observers work on JSON Types (delete type observers, local and foreign)", ->
-    u = @yTest.users[0].val("newStuff",new Y.Text("oldStuff")).val("moreStuff",new Y.Text("moreOldStuff"))
-    @yTest.flushAll()
-    last_task = null
-    observer1 = (changes)->
-      expect(changes.length).to.equal(1)
-      change = changes[0]
-      expect(change.type).to.equal("delete")
-      expect(change.object).to.equal(u)
-      expect(change.changedBy).to.equal('0')
-      expect(change.name).to.equal("newStuff")
-      expect(change.oldValue.val()).to.equal("oldStuff")
-      last_task = "observer1"
-    u.observe observer1
-    u.delete("newStuff")
-    expect(last_task).to.equal("observer1")
-    u.unobserve observer1
-
-    observer2 = (changes)->
-      expect(changes.length).to.equal(1)
-      change = changes[0]
-      expect(change.type).to.equal("delete")
-      expect(change.object).to.equal(u)
-      expect(change.changedBy).to.equal('1')
-      expect(change.name).to.equal("moreStuff")
-      expect(change.oldValue.val()).to.equal("moreOldStuff")
-      last_task = "observer2"
-    u.observe observer2
-    v = @yTest.users[1]
-    v.delete("moreStuff")
-    @yTest.flushAll()
-    expect(last_task).to.equal("observer2")
-    u.unobserve observer2
-
-  it "can handle circular JSON", ->
-    u = @yTest.users[0]
-    u.val("me", u)
-    @yTest.compareAll()
-    u.val("stuff", new Y.Object({x: true}))
-    u.val("same_stuff", u.val("stuff"))
-    u.val("same_stuff").val("x", 5)
-    expect(u.val("same_stuff").val("x")).to.equal(5)
-    @yTest.compareAll()
-    u.val("stuff").val("y", u.val("stuff"))
-    @yTest.compareAll()
-
-
-
--- a/y-object.html
+++ b/y-object.html
@@ -1,7 +0,0 @@
-
-<polymer-element name="y-object" hidden attributes="val connector y">
-</polymer-element>
-<polymer-element name="y-property" hidden attributes="val name y">
-</polymer-element>
-
-<script src="./y-object.js"></script>
--- a/y-object.js
+++ b/y-object.js
@@ -1 +0,0 @@
-!function t(n,e,l){function i(a,h){if(!e[a]){if(!n[a]){var v="function"==typeof require&&require;if(!h&&v)return v(a,!0);if(r)return r(a,!0);throw new Error("Cannot find module '"+a+"'")}var s=e[a]={exports:{}};n[a][0].call(s.exports,function(t){var e=n[a][1][t];return i(e?e:t)},s,s.exports,t,n,e,l)}return e[a].exports}for(var r="function"==typeof require&&require,a=0;a<l.length;a++)i(l[a]);return i}({1:[function(){var t;t=function(t){var n,e,l,i;for(e=l=0,i=t.children.length;i>=0?i>l:l>i;e=i>=0?++l:--l)n=t.children.item(e),null!=n.name&&(n.val=t.val.val(n.name));return t.val.observe(function(l){var i,r,a,h,v;for(v=[],a=0,h=l.length;h>a;a++)i=l[a],null!=i.name?v.push(function(){var l,a,h;for(h=[],e=l=0,a=t.children.length;a>=0?a>l:l>a;e=a>=0?++l:--l)n=t.children.item(e),null!=n.name&&n.name===i.name?(r=t.val.val(n.name),n.val!==r?h.push(n.val=r):h.push(void 0)):h.push(void 0);return h}()):v.push(void 0);return v})},Polymer("y-object",{ready:function(){return null!=this.connector?(this.val=new Y(this.connector),t(this)):null!=this.val?t(this):void 0},valChanged:function(){return null!=this.val&&"Object"===this.val._name?t(this):void 0},connectorChanged:function(){return null==this.val?(this.val=new Y(this.connector),t(this)):void 0}}),Polymer("y-property",{ready:function(){return null!=this.val&&null!=this.name&&(this.val.constructor===Object?this.val=this.parentElement.val(this.name,new Y.Object(this.val)).val(this.name):"string"==typeof this.val&&this.parentElement.val(this.name,this.val),"Object"===this.val._name)?t(this):void 0},valChanged:function(){var n;if(null!=this.val&&null!=this.name){if(this.val.constructor===Object)return this.val=this.parentElement.val.val(this.name,new Y.Object(this.val)).val(this.name);if("Object"===this.val._name)return t(this);if(null!=(null!=(n=this.parentElement.val)?n.val:void 0)&&this.val!==this.parentElement.val.val(this.name))return this.parentElement.val.val(this.name,this.val)}}})},{}]},{},[1]);
--- a/y.js
+++ b/y.js
Author	SHA1	Message	Date
Kevin Jahns	2a0d5c0cd7	Deploy 0.6.19	2015-11-04 14:36:01 +01:00
Kevin Jahns	13ed66c326	Deploy 0.6.18	2015-11-04 14:35:08 +01:00
Kevin Jahns	1c35198839	Deploy 0.6.17	2015-11-04 14:33:44 +01:00
Kevin Jahns	a7021b9212	Deploy 0.6.16	2015-11-04 14:32:04 +01:00
Kevin Jahns	1fa1f1a668	bumps package version	2015-11-04 14:10:01 +01:00
DadaMonad	243e62e320	bumps package version	2015-11-02 13:14:52 +00:00
DadaMonad	15e933ee5b	bumps package version	2015-11-02 13:04:55 +00:00
DadaMonad	605e1052ac	bumps package version	2015-11-02 13:04:08 +00:00
DadaMonad	16c00525d1	bumps package version	2015-11-02 12:57:00 +00:00
Kevin Jahns	e9da461625	update	2015-10-30 16:00:08 +01:00
Kevin Jahns	a071c07ee2	added dist submodule	2015-10-30 15:30:02 +01:00
DadaMonad	8dad4f6ed4	updated documentaiton	2015-10-25 16:15:03 +00:00
Kevin Jahns	0980609cc9	fixed bug in delete operations	2015-10-19 11:27:49 +02:00
Kevin Jahns	29f3f3f722	added offline editing demo 🌟	2015-10-18 03:07:34 +02:00
Kevin Jahns	04139d3b7e	implemented indexedDB database :shipit:	2015-10-17 23:02:51 +02:00
Kevin Jahns	45814c4e00	fixed bug (o.right is already gc'd), implemented some test helpers	2015-10-17 17:16:36 +02:00
Kevin Jahns	cf365b8902	started to remove everything RBTree related from the Transaction.js	2015-10-16 12:31:03 +02:00
Kevin Jahns	aff10fa4db	started refactoring the Memory db	2015-10-15 18:54:29 +02:00
Kevin Jahns	181595293f	refactored database	2015-10-14 19:28:19 +02:00
Kevin Jahns	ee133ef334	refactored test suites	2015-10-14 18:10:04 +02:00
Kevin Jahns	661232f23c	fixed the test suite	2015-10-14 10:27:46 +02:00
Kevin Jahns	541a93d152	refactoring the tarnsition functions	2015-10-13 21:40:36 +02:00
Kevin Jahns	d6e1cd42a2	implemented disconnect/reconnect in webrtc connector. adapted the example gc also collects child elements (needs improvements)	2015-10-13 14:50:54 +02:00
Kevin Jahns	51e20fb9c7	fixed some example issues	2015-10-12 15:59:22 +02:00
Kevin Jahns	e32aef4c9f	late join works (also when activating garbage collector), added some tests to verify (havent tested for large >500 operations)	2015-10-12 15:17:12 +02:00
Kevin Jahns	9c4074e3e3	fixed late join issues when gc is turned off	2015-10-11 03:06:26 +02:00
Kevin Jahns	aadef59934	fixed DS bugs (i guess..) now handling more complicated scenarios	2015-10-09 16:09:00 +02:00
Kevin Jahns	6a13419c62	fixed several bugs in multi join/rejoin	2015-10-08 02:12:20 +02:00
Kevin Jahns	1ace3e3120	implemented observePath, fixed some inconsistencies	2015-10-06 19:45:29 +02:00
Kevin Jahns	c95dae3c33	fixed inconsistency bugs for tests<1000	2015-10-06 14:22:52 +02:00
Kevin Jahns	82e2254302	fixed some inconsistency bugs with DS	2015-10-05 14:24:11 +02:00
DadaMonad	6e9f990d5c	small fixes that i made on the train	2015-10-05 09:48:32 +00:00
DadaMonad	7d4adf314d	fixed some bugs from the last commit	2015-10-02 08:01:58 +00:00
Kevin Jahns	8745fd64ca	code refactoring, and documentation	2015-09-29 13:59:38 +02:00
Kevin Jahns	638c575dfc	fixed some consistency bugs. new method seems to work well, it still has problems though	2015-09-29 01:01:04 +02:00
Kevin Jahns	acf8d37616	added deploy gulp method	2015-09-28 23:54:56 +02:00
Kevin Jahns	ae8be1ec6b	improved new sync idea (save gcs in DS)	2015-09-28 13:06:17 +02:00
Kevin Jahns	a5f76cee84	starting to extend the DS with gc functionality	2015-09-27 20:02:00 +02:00
Kevin Jahns	2013266d56	merged changes on home pc. some improvements on rejoin&sync	2015-09-27 00:58:23 +02:00
Kevin Jahns	b08aeee4fc	updating some changes i forgot to commit	2015-09-26 14:42:50 +02:00
Kevin Jahns	183f30878e	checking out new gc approach	2015-09-25 16:00:20 +02:00
Kevin Jahns	5e4c56af29	fixed bugs, tests are running, source is documented	2015-09-17 20:30:40 +02:00
Kevin Jahns	13bef69be4	updated gitignore	2015-09-17 02:34:43 +02:00
Kevin Jahns	b1d70ef25e	added comments to most of the classes.	2015-09-17 00:21:01 +02:00
Kevin Jahns	6f3a291ef5	fixed some tests, lint, better run-scripts	2015-09-16 16:25:30 +02:00
Kevin Jahns	2a601ac6f6	fixed some bugs & linted & prettyfied gulpfile	2015-09-13 18:22:45 +02:00
Kevin Jahns	82b3e50d49	new build system	2015-09-11 18:35:32 +02:00
Kevin Jahns	4bfe484fc2	node-inspector	2015-09-10 19:41:07 +02:00
Kevin Jahns	b9e21665e2	update	2015-09-09 20:29:39 +02:00
Kevin Jahns	06e7caab2d	gc implementation	2015-07-26 16:03:13 +00:00
Kevin Jahns	c8ded24842	started implementing the garbage collector	2015-07-26 03:13:13 +00:00
Kevin Jahns	dae0f71cbc	fixed another test	2015-07-26 00:01:53 +00:00
Kevin Jahns	81c601c65f	fixed late sync with deletions	2015-07-25 23:58:57 +00:00
Kevin Jahns	56165a3c10	late sync with insertions only work now	2015-07-25 23:26:52 +00:00
Kevin Jahns	5e0d602e12	finished & tested DeleteStore	2015-07-25 16:28:05 +00:00
Kevin Jahns	420821be31	continuing DeleteStore	2015-07-24 22:24:49 +02:00
Kevin Jahns	d1fda080d9	added some fixes and started DeleteStore implementation	2015-07-22 19:30:00 +02:00
Kevin Jahns	dd5e2adc87	update	2015-07-21 17:25:07 +02:00
Kevin Jahns	ee983ceff6	switched to standard coding style	2015-07-21 17:15:38 +02:00
Kevin Jahns	ee116b8ca4	fixed all the tests	2015-07-19 23:31:35 +00:00
Kevin Jahns	d4ef54358b	re-implementing tests with async await. tests also check asynchronous behaviour now.	2015-07-18 23:15:20 +02:00
Kevin Jahns	ebc628adfc	fixed really nasty bug, requestTransaction was called synchronously	2015-07-17 15:04:00 +02:00
Kevin Jahns	4563ccc98e	fixed trailing space bug in contenteditable elements	2015-07-17 10:43:39 +02:00
Kevin Jahns	a4f7f5c987	fixed bugs that came wih the last commit	2015-07-17 10:34:43 +02:00
Kevin Jahns	4a7f09c32d	last bug fixes for TextBind type (for now)	2015-07-16 06:53:47 +02:00
Kevin Jahns	f78dc52d7b	added textbind example, improved & fixed syncing, RBTree handles ids correctly now, webrtc connector is quite reliable now	2015-07-16 06:15:23 +02:00
Kevin Jahns	f9f8228db6	outsourcing some code. custom types definition change	2015-07-15 22:32:36 +02:00
Kevin Jahns	60b75d1862	array & type are observeable	2015-07-15 21:24:05 +02:00
Kevin Jahns	9b3fe2f197	webrtc connector working	2015-07-14 22:39:01 +02:00
Kevin Jahns	6b153896dd	delete support for Array & Map	2015-07-14 20:51:07 +02:00
Kevin Jahns	66a7d2720d	split the big text suite into smaller ones	2015-07-14 11:58:43 +02:00
Kevin Jahns	d50d34dc12	created Array type that has a good time complexity for both insert and retrieval of objects	2015-07-12 03:45:12 +02:00
Kevin Jahns	8cc374cabb	added eventhandler	2015-07-10 15:00:54 +02:00
Kevin Jahns	8e9e62b3d0	discontinuing todays session	2015-07-09 22:19:10 +02:00
Kevin Jahns	9b45a78e58	fixing types.	2015-07-09 15:50:59 +02:00
Kevin Jahns	f862fae473	fixed a bug	2015-07-09 01:33:46 +02:00
Kevin Jahns	0493d99d57	list and map types work now and they support delete. added random tests	2015-07-09 01:30:57 +02:00
Kevin Jahns	a1026bc365	use RBTree for in-memory storage	2015-07-08 21:25:36 +02:00
Kevin Jahns	fe4564542b	implemented deletion of elements & and iteration method & lots of tests	2015-07-08 20:05:18 +02:00
Kevin Jahns	7b52111c31	fixed insertion bug in RBTree. adding does now work correctly	2015-07-07 21:17:28 +02:00
Kevin Jahns	c184cb961b	implemented RBTree as a in-memory database for operations (in progress)	2015-07-07 18:11:27 +02:00
Kevin Jahns	02f2f6b0fe	wrap up todays session	2015-07-06 23:39:28 +02:00
Kevin Jahns	e47dee53a3	random tests succeed on Map :)	2015-07-06 23:04:01 +02:00
Kevin Jahns	9b6183ea70	custom types work. Now I need to re-implement the test case from 0.5	2015-07-06 18:37:54 +02:00
Kevin Jahns	79ec71d559	added test case	2015-07-06 16:57:30 +02:00
Kevin Jahns	bf4d5f24a8	simple conflicts are now handled correctly	2015-07-06 16:47:49 +02:00
Kevin Jahns	9d0373b85b	added not working tests	2015-07-03 14:43:08 +02:00
Kevin Jahns	f8ad9abcc0	late join should work now. Need to test more. root is passed to transaction generator	2015-06-30 17:57:19 +02:00
Kevin Jahns	b25977be06	Map type works with simple update & sync. now going to implement support for syncing existing operation buffers	2015-06-30 15:44:14 +02:00
Kevin Jahns	bffbb6ca27	basic get&set of Map properties works	2015-06-29 13:20:19 +02:00
Kevin Jahns	8f63147dbc	added Map struct	2015-06-28 12:42:54 +02:00
Kevin Jahns	7a274565e5	added memory data store (actually adding it..)	2015-06-28 11:14:40 +02:00
Kevin Jahns	75793d0ced	added memory data store	2015-06-28 01:42:17 +02:00
Kevin Jahns	7ec409e09f	linted all files	2015-06-27 19:01:15 +02:00
Kevin Jahns	fec03dc6e1	added test connector, webrtc connector, ideas to apply operations with very low overhead	2015-06-25 18:41:00 +02:00
Kevin Jahns	3142b0f161	added some Operations, a connector, more structure. In particular I put a lot of time into the event handling	2015-06-21 14:56:41 +02:00
Kevin Jahns	042bcee482	now using one master generator, that rulez them all	2015-06-21 09:45:57 +02:00
Kevin Jahns	b3e09d001f	updated whenOperationExists	2015-06-21 03:50:58 +02:00
Kevin Jahns	dcec0fe967	Implemented some operations. OperationStore executes now ops, not the Engine	2015-06-21 02:24:41 +02:00
Kevin Jahns	ae790b6947	updated OperationBuffer	2015-06-19 14:54:35 +02:00
Kevin Jahns	4b08cbe875	no more promises in requestTransaction :)	2015-06-18 15:11:22 +02:00
Kevin Jahns	01173879a0	Merge pull request #25 from y-js/origin/0.6 merging the infamous `origin/origin/0.6` branch	2015-06-18 11:47:47 +02:00
Kevin Jahns	6f99ee5c34	requestTransaction accepts Promises&Generators	2015-06-18 02:35:52 +02:00
Kevin Jahns	8d1bccbea0	added new generator approach	2015-06-17 19:16:52 +02:00
Kevin Jahns	b6c278f8e4	added indexeddb	2015-06-16 20:13:14 +02:00
Kevin Jahns	5a9f59913e	changed to pre-commit	2015-06-16 19:51:14 +02:00
Kevin Jahns	bf493216a2	updated gitignore, flow working	2015-06-16 17:45:05 +02:00
Kevin Jahns	d37d0ef9af	update	2015-06-16 17:18:40 +02:00
Kevin Jahns	c7a6e74dd9	updated precommit	2015-06-16 16:20:38 +02:00
Kevin Jahns	24570b791a	defined specs	2015-06-16 14:41:35 +02:00
Kevin Jahns	f99853529e	improved gulpfile	2015-06-16 14:36:00 +02:00
Kevin Jahns	159f37474d	checking out new stuff	2015-06-15 14:53:02 +02:00
Kevin Jahns	1b63f5efde	added lots of magic	2015-06-09 22:30:42 +02:00
Kevin Jahns	c3ba8173d7	added v0.6 info note	2015-06-09 18:10:11 +02:00
Kevin Jahns	7a89c1cc6d	added first prototype of the new HB with indexedDB	2015-06-09 18:08:23 +02:00
				`@@ -1 +0,0 @@`
				!function t(n,e,l){function i(a,h){if(!e[a]){if(!n[a]){var v="function"==typeof require&&require;if(!h&&v)return v(a,!0);if(r)return r(a,!0);throw new Error("Cannot find module '"+a+"'")}var s=e[a]={exports:{}};n[a][0].call(s.exports,function(t){var e=n[a][1][t];return i(e?e:t)},s,s.exports,t,n,e,l)}return e[a].exports}for(var r="function"==typeof require&&require,a=0;a<l.length;a++)i(l[a]);return i}({1:[function(){var t;t=function(t){var n,e,l,i;for(e=l=0,i=t.children.length;i>=0?i>l:l>i;e=i>=0?++l:--l)n=t.children.item(e),null!=n.name&&(n.val=t.val.val(n.name));return t.val.observe(function(l){var i,r,a,h,v;for(v=[],a=0,h=l.length;h>a;a++)i=l[a],null!=i.name?v.push(function(){var l,a,h;for(h=[],e=l=0,a=t.children.length;a>=0?a>l:l>a;e=a>=0?++l:--l)n=t.children.item(e),null!=n.name&&n.name===i.name?(r=t.val.val(n.name),n.val!==r?h.push(n.val=r):h.push(void 0)):h.push(void 0);return h}()):v.push(void 0);return v})},Polymer("y-object",{ready:function(){return null!=this.connector?(this.val=new Y(this.connector),t(this)):null!=this.val?t(this):void 0},valChanged:function(){return null!=this.val&&"Object"===this.val._name?t(this):void 0},connectorChanged:function(){return null==this.val?(this.val=new Y(this.connector),t(this)):void 0}}),Polymer("y-property",{ready:function(){return null!=this.val&&null!=this.name&&(this.val.constructor===Object?this.val=this.parentElement.val(this.name,new Y.Object(this.val)).val(this.name):"string"==typeof this.val&&this.parentElement.val(this.name,this.val),"Object"===this.val._name)?t(this):void 0},valChanged:function(){var n;if(null!=this.val&&null!=this.name){if(this.val.constructor===Object)return this.val=this.parentElement.val.val(this.name,new Y.Object(this.val)).val(this.name);if("Object"===this.val._name)return t(this);if(null!=(null!=(n=this.parentElement.val)?n.val:void 0)&&this.val!==this.parentElement.val.val(this.name))return this.parentElement.val.val(this.name,this.val)}}})},{}]},{},[1]);