v13.0.0-37 -- distribution files

2017-12-02 01:46:06 -08:00
75 changed files with 21594 additions and 2293 deletions
--- a/README.md
+++ b/README.md
@@ -64,19 +64,6 @@ missing modules.
 <script src="./bower_components/yjs/y.js"></script>
 ```

-### CDN
-```
-<script src="https://cdn.jsdelivr.net/npm/yjs@12/src/y.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-array@10/dist/y-array.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-websockets-client@8/dist/y-websockets-client.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-memory@8/dist/y-memory.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-array@10/dist/y-array.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-map@10/dist/y-map.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-text@9/dist/y-text.js"></script>
-// ..
-// do the same for all modules you want to use
-```
-
 ### Npm
 ```
 npm install --save yjs % add all y-* modules you want to use
--- a/examples/ace/index.html
+++ b/examples/ace/index.html
@@ -24,8 +24,7 @@
  <body>

    <div id="aceContainer"></div>
-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../bower_components/yjs/y.js"></script>
    <script src="../bower_components/ace-builds/src/ace.js"></script>

    <script src="./index.js"></script>
--- a/examples/ace/index.js
+++ b/examples/ace/index.js
@@ -1,17 +1,24 @@
 /* global Y, ace */

-let y = new Y('ace-example', {
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'ace-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    ace: 'Text' // y.share.textarea is of type Y.Text
  }
+}).then(function (y) {
+  window.yAce = y
+
+  // bind the textarea to a shared text element
+  var editor = ace.edit('aceContainer')
+  editor.setTheme('ace/theme/chrome')
+  editor.getSession().setMode('ace/mode/javascript')
+
+  y.share.ace.bindAce(editor)
 })
-
-window.yAce = y
-
-// bind the textarea to a shared text element
-var editor = ace.edit('aceContainer')
-editor.setTheme('ace/theme/chrome')
-editor.getSession().setMode('ace/mode/javascript')
-
-y.define('ace', Y.Text).bindAce(editor)
--- a/examples/chat/index.html
+++ b/examples/chat/index.html
@@ -13,7 +13,7 @@
      <input type="submit" value="Send">
    </form>
    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../../../y-websockets-client/dist/y-websockets-client.js"></script>
    <script src="./index.js"></script>
  </body>
 </html>
--- a/examples/chat/index.js
+++ b/examples/chat/index.js
@@ -1,9 +1,10 @@
 /* global Y */

-let y = new Y('chat-example', {
+// initialize a shared object. This function call returns a promise!
+var y = new Y({
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'chat-example'
  }
 })

@@ -22,7 +23,6 @@ function appendMessage (message, position) {
  p.appendChild(document.createTextNode(message.message))
  chatcontainer.insertBefore(p, chatcontainer.children[position] || null)
 }
-
 // This function makes sure that only 7 messages exist in the chat history.
 // The rest is deleted
 function cleanupChat () {
@@ -30,17 +30,23 @@ function cleanupChat () {
    chatprotocol.delete(0, chatprotocol.length - 7)
  }
 }
-cleanupChat()
-
 // Insert the initial content
 chatprotocol.toArray().forEach(appendMessage)
+cleanupChat()

 // whenever content changes, make sure to reflect the changes in the DOM
 chatprotocol.observe(function (event) {
+  if (event.type === 'insert') {
+    for (let i = 0; i < event.length; i++) {
+      appendMessage(event.values[i], event.index + i)
+    }
+  } else if (event.type === 'delete') {
+    for (let i = 0; i < event.length; i++) {
+      chatcontainer.children[event.index].remove()
+    }
+  }
  // concurrent insertions may result in a history > 7, so cleanup here
  cleanupChat()
-  chatcontainer.innerHTML = ''
-  chatprotocol.toArray().forEach(appendMessage)
 })
 document.querySelector('#chatform').onsubmit = function (event) {
  // the form is submitted
--- a/examples/codemirror/index.html
+++ b/examples/codemirror/index.html
@@ -5,8 +5,7 @@
  <body>
    <div id="codeMirrorContainer"></div>

-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../bower_components/yjs/y.js"></script>
    <script src="../bower_components/codemirror/lib/codemirror.js"></script>
    <script src="../bower_components/codemirror/mode/javascript/javascript.js"></script>
    <link rel="stylesheet" href="../bower_components/codemirror/lib/codemirror.css">
--- a/examples/codemirror/index.js
+++ b/examples/codemirror/index.js
@@ -1,16 +1,24 @@
 /* global Y, CodeMirror */

-let y = new Y('codemirror-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'codemirror-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    codemirror: 'Text' // y.share.codemirror is of type Y.Text
  }
-})
+}).then(function (y) {
+  window.yCodeMirror = y

-window.yCodeMirror = y
-
-var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
-  mode: 'javascript',
-  lineNumbers: true
+  var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
+    mode: 'javascript',
+    lineNumbers: true
+  })
+  y.share.codemirror.bindCodeMirror(editor)
 })
-y.define('codemirror', Y.Text).bindCodeMirror(editor)
--- a/examples/drawing/index.html
+++ b/examples/drawing/index.html
@@ -13,8 +13,11 @@
  <button type="button" id="clearDrawingCanvas">Clear Drawing</button>
  <svg id="drawingCanvas" viewbox="0 0 100 100" width="100%"></svg>
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
-  <script src="../bower_components/d3/d3.min.js"></script>
+  <script src="../../../y-array/y-array.js"></script>
+  <script src="../../../y-map/dist/y-map.js"></script>
+  <script src="../../../y-memory/y-memory.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
+  <script src="../bower_components/d3/d3.js"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/examples/drawing/index.js
+++ b/examples/drawing/index.js
@@ -1,74 +1,84 @@
 /* globals Y, d3 */
+'strict mode'

-let y = new Y('drawing-example', {
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'drawing-example',
+    url: 'localhost:1234'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    drawing: 'Array'
  }
-})
+}).then(function (y) {
+  window.yDrawing = y
+  var drawing = y.share.drawing
+  var renderPath = d3.svg.line()
+    .x(function (d) { return d[0] })
+    .y(function (d) { return d[1] })
+    .interpolate('basis')

-window.yDrawing = y
-var drawing = y.define('drawing', Y.Array)
-var renderPath = d3.svg.line()
-  .x(function (d) { return d[0] })
-  .y(function (d) { return d[1] })
-  .interpolate('basic')
+  var svg = d3.select('#drawingCanvas')
+    .call(d3.behavior.drag()
+      .on('dragstart', dragstart)
+      .on('drag', drag)
+      .on('dragend', dragend))

-var svg = d3.select('#drawingCanvas')
-  .call(d3.behavior.drag()
-    .on('dragstart', dragstart)
-    .on('drag', drag)
-    .on('dragend', dragend))
-
-// create line from a shared array object and update the line when the array changes
-function drawLine (yarray) {
-  var line = svg.append('path').datum(yarray.toArray())
-  line.attr('d', renderPath)
-  yarray.observe(function (event) {
-    line.remove()
-    line = svg.append('path').datum(yarray.toArray())
+  // create line from a shared array object and update the line when the array changes
+  function drawLine (yarray) {
+    var line = svg.append('path').datum(yarray.toArray())
    line.attr('d', renderPath)
-  })
-}
-// call drawLine every time an array is appended
-drawing.observe(function (event) {
-  event.removedElements.forEach(function () {
-    // if one is deleted, all will be deleted!!
-    svg.selectAll('path').remove()
-  })
-  event.addedElements.forEach(function (path) {
-    drawLine(path)
-  })
-})
-// draw all existing content
-for (var i = 0; i < drawing.length; i++) {
-  drawLine(drawing.get(i))
-}
-
-// clear canvas on request
-document.querySelector('#clearDrawingCanvas').onclick = function () {
-  drawing.delete(0, drawing.length)
-}
-
-var sharedLine = null
-function dragstart () {
-  drawing.insert(drawing.length, [Y.Array])
-  sharedLine = drawing.get(drawing.length - 1)
-}
-
-// After one dragged event is recognized, we ignore them for 33ms.
-var ignoreDrag = null
-function drag () {
-  if (sharedLine != null && ignoreDrag == null) {
-    ignoreDrag = window.setTimeout(function () {
-      ignoreDrag = null
-    }, 10)
-    sharedLine.push([d3.mouse(this)])
+    yarray.observe(function (event) {
+      // we only implement insert events that are appended to the end of the array
+      event.values.forEach(function (value) {
+        line.datum().push(value)
+      })
+      line.attr('d', renderPath)
+    })
+  }
+  // call drawLine every time an array is appended
+  y.share.drawing.observe(function (event) {
+    if (event.type === 'insert') {
+      event.values.forEach(drawLine)
+    } else {
+      // just remove all elements (thats what we do anyway)
+      svg.selectAll('path').remove()
+    }
+  })
+  // draw all existing content
+  for (var i = 0; i < drawing.length; i++) {
+    drawLine(drawing.get(i))
  }
-}

-function dragend () {
-  sharedLine = null
-  window.clearTimeout(ignoreDrag)
-  ignoreDrag = null
-}
+  // clear canvas on request
+  document.querySelector('#clearDrawingCanvas').onclick = function () {
+    drawing.delete(0, drawing.length)
+  }
+
+  var sharedLine = null
+  function dragstart () {
+    drawing.insert(drawing.length, [Y.Array])
+    sharedLine = drawing.get(drawing.length - 1)
+  }
+
+  // After one dragged event is recognized, we ignore them for 33ms.
+  var ignoreDrag = null
+  function drag () {
+    if (sharedLine != null && ignoreDrag == null) {
+      ignoreDrag = window.setTimeout(function () {
+        ignoreDrag = null
+      }, 33)
+      sharedLine.push([d3.mouse(this)])
+    }
+  }
+
+  function dragend () {
+    sharedLine = null
+    window.clearTimeout(ignoreDrag)
+    ignoreDrag = null
+  }
+})
--- a/examples/html-editor-drawing-hook/index.html
+++ b/examples/html-editor-drawing-hook/index.html
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-</head>
-  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
-  <script src="../bower_components/d3/d3.min.js"></script>
-  <script src="./index.js"></script>
-  <style>
-    magic-drawing .drawingCanvas path {
-      fill: none;
-      stroke: blue;
-      stroke-width: 2px;
-      stroke-linejoin: round;
-      stroke-linecap: round;
-    }
-    magic-drawing .drawingCanvas {
-      width: 500px;
-      height: 500px;
-      cursor: default;
-      padding:1px;
-      border:1px solid #021a40;
-    }
-    magic-drawing .clearDrawingButton {
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
-    magic-drawing {
-      position: relative;
-      display: block;
-    }
-  </style>
-</head>
-<body contenteditable="true">
-</body>
-</html>
--- a/examples/html-editor-drawing-hook/index.js
+++ b/examples/html-editor-drawing-hook/index.js
@@ -1,132 +0,0 @@
-/* global Y, d3 */
-
-window.onload = function () {
-  window.yXmlType.bindToDom(document.body)
-}
-
-window.addMagicDrawing = function addMagicDrawing () {
-  let mt = document.createElement('magic-drawing')
-  mt.dataset.yjsHook = 'magic-drawing'
-  document.body.append(mt)
-}
-
-var renderPath = d3.svg.line()
-  .x(function (d) { return d[0] })
-  .y(function (d) { return d[1] })
-  .interpolate('basic')
-
-function initDrawingBindings (type, dom) {
-  dom.contentEditable = 'false'
-  dom.dataset.yjsHook = 'magic-drawing'
-  var drawing = type.get('drawing')
-  if (drawing === undefined) {
-    drawing = type.set('drawing', new Y.Array())
-  }
-  var canvas = dom.querySelector('.drawingCanvas')
-  if (canvas == null) {
-    canvas = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
-    canvas.setAttribute('class', 'drawingCanvas')
-    canvas.setAttribute('viewbox', '0 0 100 100')
-    dom.insertBefore(canvas, null)
-  }
-  var clearDrawingButton = dom.querySelector('.clearDrawingButton')
-  if (clearDrawingButton == null) {
-    clearDrawingButton = document.createElement('button')
-    clearDrawingButton.setAttribute('type', 'button')
-    clearDrawingButton.setAttribute('class', 'clearDrawingButton')
-    clearDrawingButton.innerText = 'Clear Drawing'
-    dom.insertBefore(clearDrawingButton, null)
-  }
-  var svg = d3.select(canvas)
-    .call(d3.behavior.drag()
-      .on('dragstart', dragstart)
-      .on('drag', drag)
-      .on('dragend', dragend))
-  // create line from a shared array object and update the line when the array changes
-  function drawLine (yarray, svg) {
-    var line = svg.append('path').datum(yarray.toArray())
-    line.attr('d', renderPath)
-    yarray.observe(function (event) {
-      line.remove()
-      line = svg.append('path').datum(yarray.toArray())
-      line.attr('d', renderPath)
-    })
-  }
-  // call drawLine every time an array is appended
-  drawing.observe(function (event) {
-    event.removedElements.forEach(function () {
-      // if one is deleted, all will be deleted!!
-      svg.selectAll('path').remove()
-    })
-    event.addedElements.forEach(function (path) {
-      drawLine(path, svg)
-    })
-  })
-  // draw all existing content
-  for (var i = 0; i < drawing.length; i++) {
-    drawLine(drawing.get(i), svg)
-  }
-
-  // clear canvas on request
-  clearDrawingButton.onclick = function () {
-    drawing.delete(0, drawing.length)
-  }
-
-  var sharedLine = null
-  function dragstart () {
-    drawing.insert(drawing.length, [Y.Array])
-    sharedLine = drawing.get(drawing.length - 1)
-  }
-
-  // After one dragged event is recognized, we ignore them for 33ms.
-  var ignoreDrag = null
-  function drag () {
-    if (sharedLine != null && ignoreDrag == null) {
-      ignoreDrag = window.setTimeout(function () {
-        ignoreDrag = null
-      }, 10)
-      sharedLine.push([d3.mouse(this)])
-    }
-  }
-
-  function dragend () {
-    sharedLine = null
-    window.clearTimeout(ignoreDrag)
-    ignoreDrag = null
-  }
-}
-
-Y.XmlHook.addHook('magic-drawing', {
-  fillType: function (dom, type) {
-    initDrawingBindings(type, dom)
-  },
-  createDom: function (type) {
-    const dom = document.createElement('magic-drawing')
-    initDrawingBindings(type, dom)
-    return dom
-  }
-})
-
-let y = new Y('html-editor-drawing-hook-example', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
-})
-
-window.yXml = y
-window.yXmlType = y.define('xml', Y.XmlFragment)
-window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
-  captureTimeout: 500
-})
-
-document.onkeydown = function interceptUndoRedo (e) {
-  if (e.keyCode === 90 && e.metaKey) {
-    if (!e.shiftKey) {
-      window.undoManager.undo()
-    } else {
-      window.undoManager.redo()
-    }
-    e.preventDefault()
-  }
-}
--- a/examples/html-editor/index.html
+++ b/examples/html-editor/index.html
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
 <html>
 </head>
-  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <!-- jquery is not required for y-xml. It is just here for convenience, and to test batch operations. -->
+  <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+  <script src="../yjs-dist.js"></script>
+  <script src="./canvasjs.min.js"></script>
  <script src="./index.js"></script>
 </head>
 <body contenteditable="true">
--- a/examples/html-editor/index.js
+++ b/examples/html-editor/index.js
@@ -1,24 +1,85 @@
-/* global Y */
+/* global Y, HTMLElement, customElements, CanvasJS */

 window.onload = function () {
  window.yXmlType.bindToDom(document.body)
+  let mt = document.createElement('magic-table')
+  mt.innerHTML = '<table><tr><th>Amount</th></tr><tr><td>1</td></tr><tr><td>1</td></tr></table>'
+  document.body.append(mt)
 }

-let y = new Y('htmleditor', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+class MagicTable extends HTMLElement {
+  constructor () {
+    super()
+    this.createShadowRoot()
+  }
+  get _yjsHook () {
+    return 'magic-table'
+  }
+  showTable () {
+    this.shadowRoot.innerHTML = ''
+    this.shadowRoot.append(document.createElement('content'))
+  }
+  showDiagram () {
+    let dataPoints = []
+    this.querySelectorAll('td').forEach(td => {
+      let number = Number(td.textContent)
+      dataPoints.push({
+        x: (dataPoints.length + 1) * 10,
+        y: number,
+        label: '<magic-table> content'
+      })
+    })
+    this.shadowRoot.innerHTML = ''
+    var chart = new CanvasJS.Chart(this.shadowRoot,
+      {
+        title: {
+          text: 'Bar chart'
+        },
+        data: [
+          {
+            type: 'bar',
+
+            dataPoints: dataPoints
+          }
+        ]
+      })
+
+    chart.render()
+
+    // this.shadowRoot.innerHTML = '<p>dtrn</p>'
+  }
+}
+customElements.define('magic-table', MagicTable)
+
+Y.XmlHook.addHook('magic-table', {
+  fillType: function (dom, type) {
+    type.set('table', new Y.XmlElement(dom.querySelector('table')))
+  },
+  createDom: function (type) {
+    const table = type.get('table').getDom()
+    const dom = document.createElement('magic-table')
+    dom.insertBefore(table, null)
+    return dom
  }
 })

-window.y = y
+// initialize a shared object. This function call returns a promise!
+let y = new Y({
+  connector: {
+    name: 'websockets-client',
+    url: 'http://127.0.0.1:1234',
+    room: 'html-editor-example6'
+    // maxBufferLength: 100
+  }
+})
+window.yXml = y
 window.yXmlType = y.define('xml', Y.XmlFragment)
 window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
  captureTimeout: 500
 })

 document.onkeydown = function interceptUndoRedo (e) {
-  if (e.keyCode === 90 && (e.metaKey || e.ctrlKey)) {
+  if (e.keyCode === 90 && e.metaKey) {
    if (!e.shiftKey) {
      window.undoManager.undo()
    } else {
--- a/examples/indexeddb/index.html
+++ b/examples/indexeddb/index.html
@@ -16,9 +16,6 @@
        width: 100%;
      }
    </style>
-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
-    <script src='../../../y-indexeddb/y-indexeddb.js'></script>
-    <script src="./index.js"></script>
+    <script type="module" src="./index.js"></script>
  </body>
 </html>
--- a/examples/indexeddb/index.js
+++ b/examples/indexeddb/index.js
@@ -1,19 +1,24 @@
 /* global Y, CodeMirror */

-const persistence = new Y.IndexedDB()
-const connector = {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
    room: 'codemirror-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    codemirror: 'Text' // y.share.codemirror is of type Y.Text
  }
-}
+}).then(function (y) {
+  window.yCodeMirror = y

-const y = new Y('codemirror-example', connector, persistence)
-window.yCodeMirror = y
-
-var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
-  mode: 'javascript',
-  lineNumbers: true
+  var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
+    mode: 'javascript',
+    lineNumbers: true
+  })
+  y.share.codemirror.bindCodeMirror(editor)
 })
-
-y.define('codemirror', Y.Text).bindCodeMirror(editor)
--- a/examples/infiniteyjs/index.html
+++ b/examples/infiniteyjs/index.html
@@ -10,7 +10,7 @@
    .one {
      grid-column: 1 ;
    }
-    .two {
+    .two { 
      grid-column: 2;
    }
    .three {
@@ -49,7 +49,10 @@
    </div>
  </div>
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-array/y-array.js"></script>
+  <script src="../../../y-text/dist/y-text.js"></script>
+  <script src="../../../y-memory/y-memory.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/examples/infiniteyjs/index.js
+++ b/examples/infiniteyjs/index.js
@@ -1,38 +1,64 @@
 /* global Y */

-function bindYjsInstance (y, suffix) {
-  y.define('textarea', Y.Text).bind(document.getElementById('textarea' + suffix))
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'Textarea-example',
+    url: 'https://yjs-v13.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
+  }
+}).then(function (y) {
+  window.y1 = y
+  y.share.textarea.bind(document.getElementById('textarea1'))
+})
+
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'Textarea-example',
+    url: 'https://yjs-v13-second.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
+  }
+}).then(function (y) {
+  window.y2 = y
+  y.share.textarea.bind(document.getElementById('textarea2'))
  y.connector.socket.on('connection', function () {
-    document.getElementById('container' + suffix).removeAttribute('disconnected')
+    document.getElementById('container2').removeAttribute('disconnected')
  })
  y.connector.socket.on('disconnect', function () {
-    document.getElementById('container' + suffix).setAttribute('disconnected', true)
+    document.getElementById('container2').setAttribute('disconnected', true)
  })
-}
+})

-let y1 = new Y('infinite-example', {
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'Textarea-example',
+    url: 'https://yjs-v13-third.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
  }
+}).then(function (y) {
+  window.y3 = y
+  y.share.textarea.bind(document.getElementById('textarea3'))
+  y.connector.socket.on('connection', function () {
+    document.getElementById('container3').removeAttribute('disconnected')
+  })
+  y.connector.socket.on('disconnect', function () {
+    document.getElementById('container3').setAttribute('disconnected', true)
+  })
 })
-window.y1 = y1
-bindYjsInstance(y1, '1')
-
-let y2 = new Y('infinite-example', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
-})
-window.y2 = y2
-bindYjsInstance(y2, '2')
-
-let y3 = new Y('infinite-example', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
-})
-window.y3 = y3
-bindYjsInstance(y1, '3')
--- a/examples/jigsaw/index.html
+++ b/examples/jigsaw/index.html
@@ -17,7 +17,9 @@
 		</g>
  </svg>
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-map/dist/y-map.js"></script>
+  <script src="../../../y-memory/y-memory.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="../bower_components/d3/d3.js"></script>
  <script src="./index.js"></script>
 </body>
--- a/examples/jigsaw/index.js
+++ b/examples/jigsaw/index.js
@@ -1,67 +1,74 @@
+/* @flow */
 /* global Y, d3 */

-let y = new Y('jigsaw-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    room: 'Puzzle-example',
+    url: 'http://localhost:1234'
+  },
+  share: {
+    piece1: 'Map',
+    piece2: 'Map',
+    piece3: 'Map',
+    piece4: 'Map'
  }
-})
+}).then(function (y) {
+  window.yJigsaw = y
+  var origin // mouse start position - translation of piece
+  var drag = d3.behavior.drag()
+    .on('dragstart', function (params) {
+      // get the translation of the element
+      var translation = d3
+        .select(this)
+        .attr('transform')
+        .slice(10, -1)
+        .split(',')
+        .map(Number)
+      // mouse coordinates
+      var mouse = d3.mouse(this.parentNode)
+      origin = {
+        x: mouse[0] - translation[0],
+        y: mouse[1] - translation[1]
+      }
+    })
+    .on('drag', function () {
+      var mouse = d3.mouse(this.parentNode)
+      var x = mouse[0] - origin.x // =^= mouse - mouse at dragstart + translation at dragstart
+      var y = mouse[1] - origin.y
+      d3.select(this).attr('transform', 'translate(' + x + ',' + y + ')')
+    })
+    .on('dragend', function (piece, i) {
+      // save the current translation of the puzzle piece
+      var mouse = d3.mouse(this.parentNode)
+      var x = mouse[0] - origin.x
+      var y = mouse[1] - origin.y
+      piece.set('translation', {x: x, y: y})
+    })

-let jigsaw = y.define('jigsaw', Y.Map)
-window.yJigsaw = y
+  var data = [y.share.piece1, y.share.piece2, y.share.piece3, y.share.piece4]
+  var pieces = d3.select(document.querySelector('#puzzle-example')).selectAll('path').data(data)

-var origin // mouse start position - translation of piece
-var drag = d3.behavior.drag()
-  .on('dragstart', function (params) {
-    // get the translation of the element
-    var translation = d3
-      .select(this)
-      .attr('transform')
-      .slice(10, -1)
-      .split(',')
-      .map(Number)
-    // mouse coordinates
-    var mouse = d3.mouse(this.parentNode)
-    origin = {
-      x: mouse[0] - translation[0],
-      y: mouse[1] - translation[1]
-    }
-  })
-  .on('drag', function () {
-    var mouse = d3.mouse(this.parentNode)
-    var x = mouse[0] - origin.x // =^= mouse - mouse at dragstart + translation at dragstart
-    var y = mouse[1] - origin.y
-    d3.select(this).attr('transform', 'translate(' + x + ',' + y + ')')
-  })
-  .on('dragend', function (piece, i) {
-    // save the current translation of the puzzle piece
-    var mouse = d3.mouse(this.parentNode)
-    var x = mouse[0] - origin.x
-    var y = mouse[1] - origin.y
-    jigsaw.set(piece, {x: x, y: y})
-  })
+  pieces
+    .classed('draggable', true)
+    .attr('transform', function (piece) {
+      var translation = piece.get('translation') || {x: 0, y: 0}
+      return 'translate(' + translation.x + ',' + translation.y + ')'
+    }).call(drag)

-var data = ['piece1', 'piece2', 'piece3', 'piece4']
-var pieces = d3.select(document.querySelector('#puzzle-example')).selectAll('path').data(data)
-
-pieces
-  .classed('draggable', true)
-  .attr('transform', function (piece) {
-    var translation = piece.get('translation') || {x: 0, y: 0}
-    return 'translate(' + translation.x + ',' + translation.y + ')'
-  }).call(drag)
-
-data.forEach(function (piece) {
-  jigsaw.observe(function () {
-    // whenever a property of a piece changes, update the translation of the pieces
-    pieces
-      .transition()
-      .attr('transform', function (piece) {
-        var translation = piece.get(piece)
-        if (translation == null || typeof translation.x !== 'number' || typeof translation.y !== 'number') {
-          translation = { x: 0, y: 0 }
-        }
-        return 'translate(' + translation.x + ',' + translation.y + ')'
-      })
+  data.forEach(function (piece) {
+    piece.observe(function () {
+      // whenever a property of a piece changes, update the translation of the pieces
+      pieces
+        .transition()
+        .attr('transform', function (piece) {
+          var translation = piece.get('translation') || {x: 0, y: 0}
+          return 'translate(' + translation.x + ',' + translation.y + ')'
+        })
+    })
  })
 })
--- a/examples/monaco/index.html
+++ b/examples/monaco/index.html
@@ -13,8 +13,8 @@
        width: 100%;
      }
    </style>
-    <script src="../../y.js"></script>
-    <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+    <script src="../bower_components/yjs/y.js"></script>
+    <script src="../bower_components/y-websockets-client/y-websockets-client.js"></script>
    <script src="../node_modules/monaco-editor/min/vs/loader.js"></script>
    <script src="./index.js"></script>
  </body>
--- a/examples/monaco/index.js
+++ b/examples/monaco/index.js
@@ -2,21 +2,29 @@

 require.config({ paths: { 'vs': '../node_modules/monaco-editor/min/vs' } })

-let y = new Y('monaco-example', {
-  connector: {
-    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
-})
-
 require(['vs/editor/editor.main'], function () {
-  window.yMonaco = y
+  // Initialize a shared object. This function call returns a promise!
+  Y({
+    db: {
+      name: 'memory'
+    },
+    connector: {
+      name: 'websockets-client',
+      room: 'monaco-example'
+    },
+    sourceDir: '/bower_components',
+    share: {
+      monaco: 'Text' // y.share.monaco is of type Y.Text
+    }
+  }).then(function (y) {
+    window.yMonaco = y

-  // Create Monaco editor
-  var editor = monaco.editor.create(document.getElementById('monacoContainer'), {
-    language: 'javascript'
+    // Create Monaco editor
+    var editor = monaco.editor.create(document.getElementById('monacoContainer'), {
+      language: 'javascript'
+    })
+
+    // Bind to y.share.monaco
+    y.share.monaco.bindMonaco(editor)
  })
-
-  // Bind to y.share.monaco
-  y.define('monaco', Y.Text).bindMonaco(editor)
 })
--- a/examples/package-lock.json
+++ b/examples/package-lock.json
--- a/examples/package.json
+++ b/examples/package.json
@@ -9,15 +9,12 @@
  "author": "Kevin Jahns",
  "license": "MIT",
  "dependencies": {
-    "monaco-editor": "^0.8.3",
-    "rollup": "^0.52.3"
+    "monaco-editor": "^0.8.3"
  },
  "devDependencies": {
    "standard": "^10.0.2"
  },
  "standard": {
-    "ignore": [
-      "bower_components"
-    ]
+    "ignore": ["bower_components"]
  }
 }
--- a/examples/quill/index.html
+++ b/examples/quill/index.html
@@ -26,7 +26,10 @@
  <script src="../bower_components/quill/dist/quill.js"></script>
  -->
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-array/y-array.js"></script>
+  <script src="../../../y-richtext/dist/y-richtext.js"></script>
+  <script src="../../../y-memory/y-memory.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/examples/rollup.config.js
+++ b/examples/rollup.config.js
@@ -4,7 +4,7 @@ import commonjs from 'rollup-plugin-commonjs'
 var pkg = require('./package.json')

 export default {
-  input: 'yjs-dist.mjs',
+  input: 'yjs-dist.esm',
  name: 'Y',
  output: {
    file: 'yjs-dist.js',
--- a/examples/textarea/index.html
+++ b/examples/textarea/index.html
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html>
 <body>
-  <textarea style="width:80%;" rows=40 autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
+  <textarea style="width:80%;" rows=40 id="textfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../../../y-array/y-array.js"></script>
+  <script src="../../../y-text/y-text.js"></script>
+  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/examples/textarea/index.js
+++ b/examples/textarea/index.js
@@ -1,15 +1,23 @@
 /* global Y */

-let y = new Y('textarea-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
-  }
+    room: 'Textarea-example2',
+    // url: '//localhost:1234',
+    url: 'https://yjs-v13.herokuapp.com/'
+  },
+  share: {
+    textarea: 'Text'
+  },
+  timeout: 5000 // reject if no connection was established within 5 seconds
+}).then(function (y) {
+  window.yTextarea = y
+
+  // bind the textarea to a shared text element
+  y.share.textarea.bind(document.getElementById('textfield'))
 })
-
-window.yTextarea = y
-
-// bind the textarea to a shared text element
-let type = y.define('textarea', Y.Text)
-let textarea = document.querySelector('textarea')
-window.binding = new Y.TextareaBinding(type, textarea)
--- a/examples/xml/index.html
+++ b/examples/xml/index.html
@@ -3,8 +3,7 @@
 </head>
  <!-- jquery is not required for y-xml. It is just here for convenience, and to test batch operations. -->
  <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-  <script src="../../y.js"></script>
-  <script src='../../../y-websockets-client/y-websockets-client.js'></script>
+  <script src="../yjs-dist.js"></script>
  <script src="./index.js"></script>
 </head>
 <body>
--- a/examples/xml/index.js
+++ b/examples/xml/index.js
@@ -1,13 +1,23 @@
 /* global Y */

-let y = new Y('xml-example', {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
  connector: {
    name: 'websockets-client',
-    url: 'http://127.0.0.1:1234'
+    // url: 'http://127.0.0.1:1234',
+    url: 'http://192.168.178.81:1234',
+    room: 'Xml-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    xml: 'Xml("p")' // y.share.xml is of type Y.Xml with tagname "p"
  }
+}).then(function (y) {
+  window.yXml = y
+  // bind xml type to a dom, and put it in body
+  window.sharedDom = y.share.xml.getDom()
+  document.body.appendChild(window.sharedDom)
 })
-
-window.yXml = y
-// bind xml type to a dom, and put it in body
-window.sharedDom = y.define('xml', Y.XmlElement).getDom()
-document.body.appendChild(window.sharedDom)
--- a/examples/yjs-dist.esm
+++ b/examples/yjs-dist.esm
@@ -1,9 +1,7 @@

 import Y from '../src/Y.js'
 import yWebsocketsClient from '../../y-websockets-client/src/y-websockets-client.js'
-import extendYIndexedDBPersistence from '../../y-indexeddb/src/y-indexeddb.js'

 Y.extend(yWebsocketsClient)
-extendYIndexedDBPersistence(Y)

 export default Y
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "13.0.0-55",
+  "version": "13.0.0-37",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1039,7 +1039,7 @@
      "requires": {
        "anymatch": "1.3.0",
        "async-each": "1.0.1",
-        "fsevents": "1.1.3",
+        "fsevents": "1.1.2",
        "glob-parent": "2.0.0",
        "inherits": "2.0.3",
        "is-binary-path": "1.0.1",
@@ -1092,6 +1092,12 @@
      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
      "dev": true
    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
    "commander": {
      "version": "2.10.0",
      "resolved": "https://registry.npmjs.org/commander/-/commander-2.10.0.tgz",
@@ -1255,6 +1261,16 @@
      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
      "dev": true
    },
+    "cors": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz",
+      "integrity": "sha1-TPeOHSMymnSWsvwiJbd8pbteuAI=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "vary": "1.1.1"
+      }
+    },
    "currently-unhandled": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -1767,6 +1783,12 @@
      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
      "dev": true
    },
+    "etag": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz",
+      "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=",
+      "dev": true
+    },
    "event-emitter": {
      "version": "0.3.5",
      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
@@ -1777,6 +1799,21 @@
        "es5-ext": "0.10.23"
      }
    },
+    "event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+      "dev": true,
+      "requires": {
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
+      }
+    },
    "exit-hook": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
@@ -1834,6 +1871,11 @@
      "integrity": "sha1-ysNCuPqJAm7+c6Jg/p9rgE9J5H8=",
      "dev": true
    },
+    "fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+    },
    "fast-levenshtein": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -1967,6 +2009,12 @@
      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
      "dev": true
    },
+    "fresh": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
+      "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=",
+      "dev": true
+    },
    "from": {
      "version": "0.1.7",
      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
@@ -1992,14 +2040,14 @@
      "dev": true
    },
    "fsevents": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
      "dev": true,
      "optional": true,
      "requires": {
-        "nan": "2.8.0",
-        "node-pre-gyp": "0.6.39"
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.36"
      },
      "dependencies": {
        "abbrev": {
@@ -2157,6 +2205,7 @@
          "version": "2.0.5",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "boom": "2.10.1"
          }
@@ -2204,12 +2253,6 @@
          "dev": true,
          "optional": true
        },
-        "detect-libc": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
        "ecc-jsbn": {
          "version": "0.1.1",
          "bundled": true,
@@ -2351,6 +2394,7 @@
          "version": "3.1.3",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "boom": "2.10.1",
            "cryptiles": "2.0.5",
@@ -2522,13 +2566,11 @@
          "optional": true
        },
        "node-pre-gyp": {
-          "version": "0.6.39",
+          "version": "0.6.36",
          "bundled": true,
          "dev": true,
          "optional": true,
          "requires": {
-            "detect-libc": "1.0.2",
-            "hawk": "3.1.3",
            "mkdirp": "0.5.1",
            "nopt": "4.0.1",
            "npmlog": "4.1.0",
@@ -2736,6 +2778,7 @@
          "version": "1.0.9",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "hoek": "2.16.3"
          }
@@ -3496,7 +3539,7 @@
        "chokidar": "1.7.0",
        "colors": "1.1.2",
        "connect": "3.5.1",
-        "cors": "2.8.4",
+        "cors": "2.8.3",
        "event-stream": "3.3.4",
        "faye-websocket": "0.11.1",
        "http-auth": "3.1.3",
@@ -3504,127 +3547,15 @@
        "object-assign": "4.1.1",
        "opn": "5.1.0",
        "proxy-middleware": "0.15.0",
-        "send": "0.16.1",
+        "send": "0.15.3",
        "serve-index": "1.9.0"
      },
      "dependencies": {
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true
-        },
-        "cors": {
-          "version": "2.8.4",
-          "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz",
-          "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=",
-          "dev": true,
-          "requires": {
-            "object-assign": "4.1.1",
-            "vary": "1.1.1"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "depd": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-          "dev": true
-        },
-        "etag": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-          "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-          "dev": true
-        },
-        "event-stream": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-          "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-          "dev": true,
-          "requires": {
-            "duplexer": "0.1.1",
-            "from": "0.1.7",
-            "map-stream": "0.1.0",
-            "pause-stream": "0.0.11",
-            "split": "0.3.3",
-            "stream-combiner": "0.0.4",
-            "through": "2.3.8"
-          }
-        },
-        "fresh": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-          "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-          "dev": true
-        },
-        "http-errors": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-          "dev": true,
-          "requires": {
-            "depd": "1.1.1",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.0.3",
-            "statuses": "1.3.1"
-          }
-        },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-          "dev": true
-        },
        "object-assign": {
          "version": "4.1.1",
          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
          "dev": true
-        },
-        "opn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
-          "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
-          "dev": true,
-          "requires": {
-            "is-wsl": "1.1.0"
-          }
-        },
-        "proxy-middleware": {
-          "version": "0.15.0",
-          "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz",
-          "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=",
-          "dev": true
-        },
-        "send": {
-          "version": "0.16.1",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
-          "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "1.1.1",
-            "destroy": "1.0.4",
-            "encodeurl": "1.0.1",
-            "escape-html": "1.0.3",
-            "etag": "1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "1.6.2",
-            "mime": "1.4.1",
-            "ms": "2.0.0",
-            "on-finished": "2.3.0",
-            "range-parser": "1.2.0",
-            "statuses": "1.3.1"
-          }
        }
      }
    },
@@ -3780,6 +3711,12 @@
        "regex-cache": "0.4.3"
      }
    },
+    "mime": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
+      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
+      "dev": true
+    },
    "mime-db": {
      "version": "1.27.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
@@ -3844,9 +3781,9 @@
      "dev": true
    },
    "nan": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
      "dev": true,
      "optional": true
    },
@@ -3952,6 +3889,15 @@
      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
      "dev": true
    },
+    "opn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
+      "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "1.1.0"
+      }
+    },
    "optionator": {
      "version": "0.8.2",
      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -4199,6 +4145,12 @@
      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
      "dev": true
    },
+    "proxy-middleware": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz",
+      "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=",
+      "dev": true
+    },
    "randomatic": {
      "version": "1.1.7",
      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
@@ -4674,6 +4626,38 @@
      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
      "dev": true
    },
+    "send": {
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz",
+      "integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.7",
+        "depd": "1.1.0",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.0",
+        "fresh": "0.5.0",
+        "http-errors": "1.6.1",
+        "mime": "1.3.4",
+        "ms": "2.0.0",
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
    "serve-index": {
      "version": "1.9.0",
      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.0.tgz",
@@ -4895,6 +4879,16 @@
        "strip-ansi": "3.0.1"
      }
    },
+    "string.fromcodepoint": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz",
+      "integrity": "sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM="
+    },
+    "string.prototype.codepointat": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz",
+      "integrity": "sha1-aybpvTr8qnvjtCabUm3huCAArHg="
+    },
    "string_decoder": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -5115,6 +5109,20 @@
      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
      "dev": true
    },
+    "utf-8": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/utf-8/-/utf-8-1.0.0.tgz",
+      "integrity": "sha1-QpwJ+xrDLOuvVllh7aSMs/RSIZc=",
+      "requires": {
+        "string.fromcodepoint": "0.2.1",
+        "string.prototype.codepointat": "0.2.0"
+      }
+    },
+    "utf8": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz",
+      "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY="
+    },
    "util-deprecate": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "13.0.0-55",
+  "version": "13.0.0-37",
  "description": "A framework for real-time p2p shared editing on any data",
  "main": "./y.node.js",
  "browser": "./y.js",
@@ -65,6 +65,9 @@
    "tag-dist-files": "^0.1.6"
  },
  "dependencies": {
-    "debug": "^2.6.8"
+    "debug": "^2.6.8",
+    "fast-diff": "^1.1.2",
+    "utf-8": "^1.0.0",
+    "utf8": "^2.1.2"
  }
 }
--- a/rollup.test.js
+++ b/rollup.test.js
@@ -3,7 +3,7 @@ import commonjs from 'rollup-plugin-commonjs'
 import multiEntry from 'rollup-plugin-multi-entry'

 export default {
-  input: 'test/index.js',
+  input: 'test/y-xml.tests.js',
  name: 'y-tests',
  sourcemap: true,
  output: {
@@ -11,12 +11,12 @@ export default {
    format: 'umd'
  },
  plugins: [
-    multiEntry(),
    nodeResolve({
      main: true,
      module: true,
      browser: true
    }),
-    commonjs()
+    commonjs(),
+    multiEntry()
  ]
 }
--- a/src/Binary/Decoder.js
+++ b/src/Binary/Decoder.js
@@ -1,3 +1,4 @@
+import utf8 from 'utf-8'
 import ID from '../Util/ID.js'
 import { default as RootID, RootFakeUserID } from '../Util/RootID.js'

@@ -90,8 +91,7 @@ export default class BinaryDecoder {
    for (let i = 0; i < len; i++) {
      bytes[i] = this.uint8arr[this.pos++]
    }
-    let encodedString = String.fromCodePoint(...bytes)
-    return decodeURIComponent(escape(encodedString))
+    return utf8.getStringFromBytes(bytes)
  }
  /**
   *  Look ahead and read varString without incrementing position
--- a/src/Binary/Encoder.js
+++ b/src/Binary/Encoder.js
@@ -1,3 +1,4 @@
+import utf8 from 'utf-8'
 import { RootFakeUserID } from '../Util/RootID.js'

 const bits7 = 0b1111111
@@ -61,8 +62,7 @@ export default class BinaryEncoder {
  }

  writeVarString (str) {
-    let encodedString = unescape(encodeURIComponent(str))
-    let bytes = encodedString.split('').map(c => c.codePointAt())
+    let bytes = utf8.setBytesFromString(str)
    let len = bytes.length
    this.writeVarUint(len)
    for (let i = 0; i < len; i++) {
--- a/src/Binding/Binding.js
+++ b/src/Binding/Binding.js
@@ -1,14 +0,0 @@
-
-import { createMutualExclude } from '../Util/mutualExclude.js'
-
-export default class Binding {
-  constructor (type, target) {
-    this.type = type
-    this.target = target
-    this._mutualExclude = createMutualExclude()
-  }
-  destroy () {
-    this.type = null
-    this.target = null
-  }
-}
--- a/src/Binding/DomBinding.js
+++ b/src/Binding/DomBinding.js
--- a/src/Binding/TextareaBinding.js
+++ b/src/Binding/TextareaBinding.js
@@ -1,45 +0,0 @@
-
-import Binding from './Binding.js'
-import simpleDiff from '../Util/simpleDiff.js'
-import { getRelativePosition, fromRelativePosition } from '../Util/relativePosition.js'
-
-function typeObserver () {
-  this._mutualExclude(() => {
-    const textarea = this.target
-    const textType = this.type
-    const relativeStart = getRelativePosition(textType, textarea.selectionStart)
-    const relativeEnd = getRelativePosition(textType, textarea.selectionEnd)
-    textarea.value = textType.toString()
-    const start = fromRelativePosition(textType._y, relativeStart)
-    const end = fromRelativePosition(textType._y, relativeEnd)
-    textarea.setSelectionRange(start, end)
-  })
-}
-
-function domObserver () {
-  this._mutualExclude(() => {
-    let diff = simpleDiff(this.type.toString(), this.target.value)
-    this.type.delete(diff.pos, diff.remove)
-    this.type.insert(diff.pos, diff.insert)
-  })
-}
-
-export default class TextareaBinding extends Binding {
-  constructor (textType, domTextarea) {
-    // Binding handles textType as this.type and domTextarea as this.target
-    super(textType, domTextarea)
-    // set initial value
-    domTextarea.value = textType.toString()
-    // Observers are handled by this class
-    this._typeObserver = typeObserver.bind(this)
-    this._domObserver = domObserver.bind(this)
-    textType.observe(this._typeObserver)
-    domTextarea.addEventListener('input', this._domObserver)
-  }
-  destroy () {
-    // Remove everything that is handled by this class
-    this.type.unobserve(this._typeObserver)
-    this.target.unobserve(this._domObserver)
-    super.destroy()
-  }
-}
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -132,7 +132,6 @@ export default class AbstractConnector {
        f()
      }
      this.whenSyncedListeners = []
-      this.y._setContentReady()
      this.y.emit('synced')
    }
  }
@@ -269,7 +268,7 @@ export default class AbstractConnector {
        if (messageType === 'sync step 2' && senderConn.auth === 'write') {
          readSyncStep2(decoder, encoder, y, senderConn, sender)
        } else if (messageType === 'update' && (skipAuth || senderConn.auth === 'write')) {
-          integrateRemoteStructs(y, decoder)
+          integrateRemoteStructs(decoder, encoder, y, senderConn, sender)
        } else {
          throw new Error('Unable to receive message')
        }
--- a/src/MessageHandler/binaryEncode.js
+++ b/src/MessageHandler/binaryEncode.js
@@ -1,18 +0,0 @@
-import { writeStructs } from './syncStep1.js'
-import { integrateRemoteStructs } from './integrateRemoteStructs.js'
-import { readDeleteSet, writeDeleteSet } from './deleteSet.js'
-import BinaryEncoder from '../Binary/Encoder.js'
-
-export function fromBinary (y, decoder) {
-  y.transact(function () {
-    integrateRemoteStructs(y, decoder)
-    readDeleteSet(y, decoder)
-  })
-}
-
-export function toBinary (y) {
-  let encoder = new BinaryEncoder()
-  writeStructs(y, encoder, new Map())
-  writeDeleteSet(y, encoder)
-  return encoder
-}
--- a/src/MessageHandler/integrateRemoteStructs.js
+++ b/src/MessageHandler/integrateRemoteStructs.js
@@ -65,7 +65,7 @@ export function stringifyStructs (y, decoder, strBuilder) {
  }
 }

-export function integrateRemoteStructs (y, decoder) {
+export function integrateRemoteStructs (decoder, encoder, y) {
  const len = decoder.readUint32()
  for (let i = 0; i < len; i++) {
    let reference = decoder.readVarUint()
--- a/src/MessageHandler/syncStep1.js
+++ b/src/MessageHandler/syncStep1.js
@@ -30,7 +30,7 @@ export function sendSyncStep1 (connector, syncUser) {
  connector.send(syncUser, encoder.createBuffer())
 }

-export function writeStructs (y, encoder, ss) {
+export default function writeStructs (encoder, decoder, y, ss) {
  const lenPos = encoder.pos
  encoder.writeUint32(0)
  let len = 0
@@ -60,7 +60,7 @@ export function readSyncStep1 (decoder, encoder, y, senderConn, sender) {
  encoder.writeVarString('sync step 2')
  encoder.writeVarString(y.connector.authInfo || '')
  const ss = readStateSet(decoder)
-  writeStructs(y, encoder, ss)
+  writeStructs(encoder, decoder, y, ss)
  writeDeleteSet(y, encoder)
  y.connector.send(senderConn.uid, encoder.createBuffer())
  senderConn.receivedSyncStep2 = true
--- a/src/MessageHandler/syncStep2.js
+++ b/src/MessageHandler/syncStep2.js
@@ -22,7 +22,7 @@ export function stringifySyncStep2 (y, decoder, strBuilder) {
 }

 export function readSyncStep2 (decoder, encoder, y, senderConn, sender) {
-  integrateRemoteStructs(y, decoder)
+  integrateRemoteStructs(decoder, encoder, y)
  readDeleteSet(y, decoder)
  y.connector._setSyncedWith(sender)
 }
--- a/src/Persistence.js
+++ b/src/Persistence.js
@@ -1,119 +1,47 @@
-import BinaryEncoder from './Binary/Encoder.js'
-import BinaryDecoder from './Binary/Decoder.js'
-import { toBinary, fromBinary } from './MessageHandler/binaryEncode.js'
-import { integrateRemoteStructs } from './MessageHandler/integrateRemoteStructs.js'
-import { createMutualExclude } from './Util/mutualExclude.js'
+// import BinaryEncoder from './Binary/Encoder.js'

-function getFreshCnf () {
-  let buffer = new BinaryEncoder()
-  buffer.writeUint32(0)
-  return {
-    len: 0,
-    buffer
-  }
-}
-
-export default class AbstractPersistence {
-  constructor (opts) {
-    this.opts = opts
-    this.ys = new Map()
-  }
-
-  _init (y) {
-    let cnf = this.ys.get(y)
-    if (cnf === undefined) {
-      cnf = getFreshCnf()
-      cnf.mutualExclude = createMutualExclude()
-      this.ys.set(y, cnf)
-      return this.init(y).then(() => {
-        y.on('afterTransaction', (y, transaction) => {
-          let cnf = this.ys.get(y)
-          if (cnf.len > 0) {
-            cnf.buffer.setUint32(0, cnf.len)
-            this.saveUpdate(y, cnf.buffer.createBuffer(), transaction)
-            let _cnf = getFreshCnf()
-            for (let key in _cnf) {
-              cnf[key] = _cnf[key]
-            }
-          }
-        })
-        return this.retrieve(y)
-      }).then(function () {
-        return Promise.resolve(cnf)
-      })
-    } else {
-      return Promise.resolve(cnf)
+export default function extendPersistence (Y) {
+  class AbstractPersistence {
+    constructor (y, opts) {
+      this.y = y
+      this.opts = opts
+      this.saveOperationsBuffer = []
+      this.log = Y.debug('y:persistence')
    }
-  }
-  deinit (y) {
-    this.ys.delete(y)
-    y.persistence = null
-  }

-  destroy () {
-    this.ys = null
-  }
+    saveToMessageQueue (binary) {
+      this.log('Room %s: Save message to message queue', this.y.options.connector.room)
+    }

-  /**
-   * Remove all persisted data that belongs to a room.
-   * Automatically destroys all Yjs all Yjs instances that persist to
-   * the room. If `destroyYjsInstances = false` the persistence functionality
-   * will be removed from the Yjs instances.
-   *
-   * ** Must be overwritten! **
-   */
-  removePersistedData (room, destroyYjsInstances = true) {
-    this.ys.forEach((cnf, y) => {
-      if (y.room === room) {
-        if (destroyYjsInstances) {
-          y.destroy()
-        } else {
-          this.deinit(y)
+    saveOperations (ops) {
+      ops = ops.map(function (op) {
+        return Y.Struct[op.struct].encode(op)
+      })
+      /*
+      const saveOperations = () => {
+        if (this.saveOperationsBuffer.length > 0) {
+          let encoder = new BinaryEncoder()
+          encoder.writeVarString(this.opts.room)
+          encoder.writeVarString('update')
+          let ops = this.saveOperationsBuffer
+          this.saveOperationsBuffer = []
+          let length = ops.length
+          encoder.writeUint32(length)
+          for (var i = 0; i < length; i++) {
+            let op = ops[i]
+            Y.Struct[op.struct].binaryEncode(encoder, op)
+          }
+          this.saveToMessageQueue(encoder.createBuffer())
        }
      }
-    })
-  }
-
-  /* overwrite */
-  saveUpdate (buffer) {
-  }
-
-  /**
-   * Save struct to update buffer.
-   * saveUpdate is called when transaction ends
-   */
-  saveStruct (y, struct) {
-    let cnf = this.ys.get(y)
-    if (cnf !== undefined) {
-      cnf.mutualExclude(function () {
-        struct._toBinary(cnf.buffer)
-        cnf.len++
-      })
+      */
+      if (this.saveOperationsBuffer.length === 0) {
+        this.saveOperationsBuffer = ops
+      } else {
+        this.saveOperationsBuffer = this.saveOperationsBuffer.concat(ops)
+      }
    }
  }

-  /* overwrite */
-  retrieve (y, model, updates) {
-    let cnf = this.ys.get(y)
-    if (cnf !== undefined) {
-      cnf.mutualExclude(function () {
-        y.transact(function () {
-          if (model != null) {
-            fromBinary(y, new BinaryDecoder(new Uint8Array(model)))
-          }
-          if (updates != null) {
-            for (let i = 0; i < updates.length; i++) {
-              integrateRemoteStructs(y, new BinaryDecoder(new Uint8Array(updates[i])))
-            }
-          }
-        })
-        y.emit('persistenceReady')
-      })
-    }
-  }
-
-  /* overwrite */
-  persist (y) {
-    return toBinary(y).createBuffer()
-  }
+  Y.AbstractPersistence = AbstractPersistence
 }
--- a/src/Struct/Delete.js
+++ b/src/Struct/Delete.js
@@ -7,7 +7,7 @@ import { logID } from '../MessageHandler/messageToString.js'
 * TODO: implement getItemCleanStartNode for better performance (only one lookup)
 */
 export function deleteItemRange (y, user, clock, range) {
-  const createDelete = y.connector !== null && y.connector._forwardAppliedStructs
+  const createDelete = y.connector._forwardAppliedStructs
  let item = y.os.getItemCleanStart(new ID(user, clock))
  if (item !== null) {
    if (!item._deleted) {
@@ -70,12 +70,12 @@ export default class Delete {
      // from remote
      const id = this._targetID
      deleteItemRange(y, id.user, id.clock, this._length)
-    } else if (y.connector !== null) {
+    } else {
      // from local
      y.connector.broadcastStruct(this)
    }
    if (y.persistence !== null) {
-      y.persistence.saveStruct(y, this)
+      y.persistence.saveOperations(this)
    }
  }
  _logString () {
--- a/src/Struct/Item.js
+++ b/src/Struct/Item.js
@@ -51,57 +51,20 @@ export default class Item {
    this._parent = null
    this._parentSub = null
    this._deleted = false
-    this._redone = null
  }
  /**
-   * Create a operation with the same effect (without position effect)
+   * Copy the effect of struct
   */
  _copy () {
-    return new this.constructor()
-  }
-  /**
-   * Redo the effect of this operation.
-   */
-  _redo (y) {
-    if (this._redone !== null) {
-      return this._redone
-    }
-    let struct = this._copy()
-    let left = this._left
-    let right = this
-    let parent = this._parent
-    // make sure that parent is redone
-    if (parent._deleted === true && parent._redone === null) {
-      parent._redo(y)
-    }
-    if (parent._redone !== null) {
-      parent = parent._redone
-      // find next cloned items
-      while (left !== null) {
-        if (left._redone !== null && left._redone._parent === parent) {
-          left = left._redone
-          break
-        }
-        left = left._left
-      }
-      while (right !== null) {
-        if (right._redone !== null && right._redone._parent === parent) {
-          right = right._redone
-        }
-        right = right._right
-      }
-    }
-    struct._origin = left
-    struct._left = left
-    struct._right = right
-    struct._right_origin = right
-    struct._parent = parent
+    let struct = new this.constructor()
+    struct._origin = this._left
+    struct._left = this._left
+    struct._right = this
+    struct._right_origin = this
+    struct._parent = this._parent
    struct._parentSub = this._parentSub
-    struct._integrate(y)
-    this._redone = struct
    return struct
  }
-
  get _lastId () {
    return new ID(this._id.user, this._id.clock + this._length - 1)
  }
@@ -124,22 +87,16 @@ export default class Item {
    return this._right
  }
  _delete (y, createDelete = true) {
-    if (!this._deleted) {
-      this._deleted = true
-      y.ds.markDeleted(this._id, this._length)
+    this._deleted = true
+    y.ds.markDeleted(this._id, this._length)
+    if (createDelete) {
      let del = new Delete()
      del._targetID = this._id
      del._length = this._length
-      if (createDelete) {
-        // broadcast and persists Delete
-        del._integrate(y, true)
-      } else if (y.persistence !== null) {
-        // only persist Delete
-        y.persistence.saveStruct(y, del)
-      }
-      transactionTypeChanged(y, this._parent, this._parentSub)
-      y._transaction.deletedStructs.add(this)
+      del._integrate(y, true)
    }
+    transactionTypeChanged(y, this._parent, this._parentSub)
+    y._transaction.deletedStructs.add(this)
  }
  /**
   * This is called right before this struct receives any children.
@@ -154,11 +111,9 @@ export default class Item {
   * - Check if this is struct deleted
   */
  _integrate (y) {
-    y._transaction.newTypes.add(this)
    const parent = this._parent
    const selfID = this._id
-    const user = selfID === null ? y.userID : selfID.user
-    const userState = y.ss.getState(user)
+    const userState = selfID === null ? 0 : y.ss.getState(selfID.user)
    if (selfID === null) {
      this._id = y.ss.getNextID(this._length)
    } else if (selfID.user === RootFakeUserID) {
@@ -261,11 +216,11 @@ export default class Item {
    y.os.put(this)
    transactionTypeChanged(y, parent, parentSub)
    if (this._id.user !== RootFakeUserID) {
-      if (y.connector !== null && (y.connector._forwardAppliedStructs || this._id.user === y.userID)) {
+      if (y.connector._forwardAppliedStructs || this._id.user === y.userID) {
        y.connector.broadcastStruct(this)
      }
      if (y.persistence !== null) {
-        y.persistence.saveStruct(y, this)
+        y.persistence.saveOperations(this)
      }
    }
  }
--- a/src/Struct/Type.js
+++ b/src/Struct/Type.js
@@ -79,6 +79,39 @@ export default class Type extends Item {
      type = type._parent
    }
  }
+  _copy (undeleteChildren) {
+    let copy = super._copy()
+    let map = new Map()
+    copy._map = map
+    for (let [key, value] of this._map) {
+      if (undeleteChildren.has(value) || !value.deleted) {
+        let _item = value._copy(undeleteChildren)
+        _item._parent = copy
+        map.set(key, value._copy(undeleteChildren))
+      }
+    }
+    let prevUndeleted = null
+    copy._start = null
+    let item = this._start
+    while (item !== null) {
+      if (undeleteChildren.has(item) || !item.deleted) {
+        let _item = item._copy(undeleteChildren)
+        _item._left = prevUndeleted
+        _item._origin = prevUndeleted
+        _item._right = null
+        _item._right_origin = null
+        _item._parent = copy
+        if (prevUndeleted === null) {
+          copy._start = _item
+        } else {
+          prevUndeleted._right = _item
+        }
+        prevUndeleted = _item
+      }
+      item = item._right
+    }
+    return copy
+  }
  _transact (f) {
    const y = this._y
    if (y !== null) {
@@ -100,6 +133,7 @@ export default class Type extends Item {
    this._deepEventHandler.removeEventListener(f)
  }
  _integrate (y) {
+    y._transaction.newTypes.add(this)
    super._integrate(y)
    this._y = y
    // when integrating children we must make sure to
--- a/src/Type/YArray.js
+++ b/src/Type/YArray.js
@@ -5,42 +5,15 @@ import { logID } from '../MessageHandler/messageToString.js'
 import YEvent from '../Util/YEvent.js'

 class YArrayEvent extends YEvent {
-  constructor (yarray, remote, transaction) {
+  constructor (yarray, remote) {
    super(yarray)
    this.remote = remote
-    this._transaction = transaction
-    this._addedElements = null
-  }
-  get addedElements () {
-    if (this._addedElements === null) {
-      const target = this.target
-      const transaction = this._transaction
-      const addedElements = new Set()
-      transaction.newTypes.forEach(function (type) {
-        if (type._parent === target && !transaction.deletedStructs.has(type)) {
-          addedElements.add(type)
-        }
-      })
-      this._addedElements = addedElements
-    }
-    return this._addedElements
-  }
-  get removedElements () {
-    const target = this.target
-    const transaction = this._transaction
-    const removedElements = new Set()
-    transaction.deletedStructs.forEach(function (struct) {
-      if (struct._parent === target && !transaction.newTypes.has(struct)) {
-        removedElements.add(struct)
-      }
-    })
-    return removedElements
  }
 }

 export default class YArray extends Type {
  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YArrayEvent(this, remote, transaction))
+    this._callEventHandler(transaction, new YArrayEvent(this, remote))
  }
  get (pos) {
    let n = this._start
@@ -211,12 +184,8 @@ export default class YArray extends Type {
          prevJsonIns._content.push(c)
        }
      }
-      if (prevJsonIns !== null) {
-        if (y !== null) {
-          prevJsonIns._integrate(y)
-        } else if (prevJsonIns._left === null) {
-          this._start = prevJsonIns
-        }
+      if (prevJsonIns !== null && y !== null) {
+        prevJsonIns._integrate(y)
      }
    })
  }
@@ -245,17 +214,6 @@ export default class YArray extends Type {
    }
    this.insertAfter(left, content)
  }
-  push (content) {
-    let n = this._start
-    let lastUndeleted = null
-    while (n !== null) {
-      if (!n._deleted) {
-        lastUndeleted = n
-      }
-      n = n._right
-    }
-    this.insertAfter(lastUndeleted, content)
-  }
  _logString () {
    const left = this._left !== null ? this._left._lastId : null
    const origin = this._origin !== null ? this._origin._lastId : null
--- a/src/Type/YMap.js
+++ b/src/Type/YMap.js
@@ -56,7 +56,7 @@ export default class YMap extends Type {
    this._transact(y => {
      const old = this._map.get(key) || null
      if (old !== null) {
-        if (old.constructor === ItemJSON && !old._deleted && old._content[0] === value) {
+        if (old instanceof ItemJSON && old._content[0] === value) {
          // Trying to overwrite with same value
          // break here
          return value
--- a/src/Type/YText.js
+++ b/src/Type/YText.js
@@ -24,9 +24,6 @@ export default class YText extends YArray {
    return strBuilder.join('')
  }
  insert (pos, text) {
-    if (text.length <= 0) {
-      return
-    }
    this._transact(y => {
      let left = null
      let right = this._start
--- a/src/Type/y-xml/YXmlElement.js
+++ b/src/Type/y-xml/YXmlElement.js
@@ -1,3 +1,4 @@
+// import diff from 'fast-diff'
 import { defaultDomFilter } from './utils.js'

 import YMap from '../YMap.js'
@@ -8,9 +9,6 @@ export default class YXmlElement extends YXmlFragment {
    super()
    this.nodeName = null
    this._scrollElement = null
-    if (typeof arg2 === 'function') {
-      this._domFilter = arg2
-    }
    if (typeof arg1 === 'string') {
      this.nodeName = arg1.toUpperCase()
    } else if (arg1 != null && arg1.nodeType != null && arg1.nodeType === arg1.ELEMENT_NODE) {
@@ -19,9 +17,12 @@ export default class YXmlElement extends YXmlFragment {
    } else {
      this.nodeName = 'UNDEFINED'
    }
+    if (typeof arg2 === 'function') {
+      this._domFilter = arg2
+    }
  }
-  _copy () {
-    let struct = super._copy()
+  _copy (undeleteChildren) {
+    let struct = super._copy(undeleteChildren)
    struct.nodeName = this.nodeName
    return struct
  }
@@ -36,10 +37,9 @@ export default class YXmlElement extends YXmlFragment {
      let attributes = new Map()
      for (let i = 0; i < dom.attributes.length; i++) {
        let attr = dom.attributes[i]
-        // get attribute via getAttribute for custom element support (some write something different in attr.value)
-        attributes.set(attr.name, dom.getAttribute(attr.name))
+        attributes.set(attr.name, attr.value)
      }
-      attributes = this._domFilter(dom.nodeName, attributes)
+      attributes = this._domFilter(dom, attributes)
      attributes.forEach((value, name) => {
        this.setAttribute(name, value)
      })
@@ -48,11 +48,6 @@ export default class YXmlElement extends YXmlFragment {
      return dom
    }
  }
-  _bindToDom (dom, _document) {
-    _document = _document || document
-    this._dom = dom
-    dom._yxml = this
-  }
  _fromBinary (y, decoder) {
    const missing = super._fromBinary(y, decoder)
    this.nodeName = decoder.readVarString()
--- a/src/Type/y-xml/YXmlFragment.js
+++ b/src/Type/y-xml/YXmlFragment.js
@@ -7,7 +7,7 @@ import YArray from '../YArray.js'
 import YXmlEvent from './YXmlEvent.js'
 import { YXmlText, YXmlHook } from './y-xml'
 import { logID } from '../../MessageHandler/messageToString.js'
-import diff from '../../Util/simpleDiff.js'
+import diff from 'fast-diff'

 function domToYXml (parent, doms, _document) {
  const types = []
@@ -17,7 +17,7 @@ function domToYXml (parent, doms, _document) {
    }
    if (parent._domFilter(d.nodeName, new Map()) !== null) {
      let type
-      const hookName = d._yjsHook || (d.dataset != null ? d.dataset.yjsHook : undefined)
+      const hookName = d._yjsHook
      if (hookName !== undefined) {
        type = new YXmlHook(hookName, d)
      } else if (d.nodeType === d.TEXT_NODE) {
@@ -55,7 +55,7 @@ class YXmlTreeWalker {
      }
    }
    do {
-      if (!n._deleted && (n.constructor === YXmlFragment._YXmlElement || n.constructor === YXmlFragment) && n._start !== null) {
+      if (!n._deleted && n.constructor === YXmlFragment._YXmlElement && n._start !== null) {
        // walk down in the tree
        n = n._start
      } else {
@@ -101,11 +101,9 @@ export default class YXmlFragment extends YArray {
        } catch (e) {
          console.error(e)
        }
-        /*
        if (this._domObserver !== null) {
          this._domObserver.takeRecords()
        }
-        */
        token = true
      }
    }
@@ -145,27 +143,8 @@ export default class YXmlFragment extends YArray {
  }
  setDomFilter (f) {
    this._domFilter = f
-    let attributes = new Map()
-    if (this.getAttributes !== undefined) {
-      let attrs = this.getAttributes()
-      for (let key in attrs) {
-        attributes.set(key, attrs[key])
-      }
-    }
-    this._y.transact(() => {
-      let result = this._domFilter(this.nodeName, new Map(attributes))
-      if (result === null) {
-        this._delete(this._y)
-      } else {
-        attributes.forEach((value, key) => {
-          if (!result.has(key)) {
-            this.removeAttribute(key)
-          }
-        })
-      }
-      this.forEach(xml => {
-        xml.setDomFilter(f)
-      })
+    this.forEach(xml => {
+      xml.setDomFilter(f)
    })
  }
  _callObserver (transaction, parentSubs, remote) {
@@ -187,9 +166,6 @@ export default class YXmlFragment extends YArray {
      this._dom._yxml = null
      this._dom = null
    }
-    if (this._beforeTransactionHandler !== undefined) {
-      this._y.off('beforeTransaction', this._beforeTransactionHandler)
-    }
  }
  insertDomElementsAfter (prev, doms, _document) {
    const types = domToYXml(this, doms, _document)
@@ -223,7 +199,9 @@ export default class YXmlFragment extends YArray {
    _document = _document || document
    this._dom = dom
    dom._yxml = this
-    if (this._parent === null) {
+    // TODO: refine this..
+    if ((this.constructor !== YXmlFragment && this._parent !== this._y) || this._parent === null) {
+      // TODO: only top level YXmlFragment can bind. Also allow YXmlElements..
      return
    }
    this._y.on('beforeTransaction', beforeTransactionSelectionFixer)
@@ -280,10 +258,9 @@ export default class YXmlFragment extends YArray {
    })
    // Apply Dom changes on Y.Xml
    if (typeof MutationObserver !== 'undefined') {
-      this._beforeTransactionHandler = () => {
+      this._y.on('beforeTransaction', () => {
        this._domObserverListener(this._domObserver.takeRecords())
-      }
-      this._y.on('beforeTransaction', this._beforeTransactionHandler)
+      })
      this._domObserverListener = mutations => {
        this._mutualExclude(() => {
          this._y.transact(() => {
@@ -297,9 +274,19 @@ export default class YXmlFragment extends YArray {
              }
              switch (mutation.type) {
                case 'characterData':
-                  var change = diff(yxml.toString(), dom.nodeValue)
-                  yxml.delete(change.pos, change.remove)
-                  yxml.insert(change.pos, change.insert)
+                  var diffs = diff(yxml.toString(), dom.nodeValue)
+                  var pos = 0
+                  for (var i = 0; i < diffs.length; i++) {
+                    var d = diffs[i]
+                    if (d[0] === 0) { // EQUAL
+                      pos += d[1].length
+                    } else if (d[0] === -1) { // DELETE
+                      yxml.delete(pos, d[1].length)
+                    } else { // INSERT
+                      yxml.insert(pos, d[1])
+                      pos += d[1].length
+                    }
+                  }
                  break
                case 'attributes':
                  if (yxml.constructor === YXmlFragment) {
@@ -326,9 +313,6 @@ export default class YXmlFragment extends YArray {
              }
            })
            for (let dom of diffChildren) {
-              if (dom.yOnChildrenChanged !== undefined) {
-                dom.yOnChildrenChanged()
-              }
              if (dom._yxml != null && dom._yxml !== false) {
                applyChangesFromDom(dom)
              }
--- a/src/Type/y-xml/YXmlHook.js
+++ b/src/Type/y-xml/YXmlHook.js
@@ -14,11 +14,6 @@ export default class YXmlHook extends YMap {
      getHook(hookName).fillType(dom, this)
    }
  }
-  _copy () {
-    const struct = super._copy()
-    struct.hookName = this.hookName
-    return struct
-  }
  getDom (_document) {
    _document = _document || document
    if (this._dom === null) {
@@ -29,11 +24,6 @@ export default class YXmlHook extends YMap {
    }
    return this._dom
  }
-  _unbindFromDom () {
-    this._dom._yxml = null
-    this._yxml = null
-    // TODO: cleanup hook?
-  }
  _fromBinary (y, decoder) {
    const missing = super._fromBinary(y, decoder)
    this.hookName = decoder.readVarString()
--- a/src/Type/y-xml/selection.js
+++ b/src/Type/y-xml/selection.js
@@ -68,6 +68,7 @@ export function afterTransactionSelectionFixer (y, transaction, remote) {
    }
  }
  if (shouldUpdate) {
+    console.info('updating selection!!')
    browserSelection.setBaseAndExtent(
      anchorNode,
      anchorOffset,
@@ -75,4 +76,7 @@ export function afterTransactionSelectionFixer (y, transaction, remote) {
      focusOffset
    )
  }
+  // delete, so the objects can be gc'd
+  relativeSelection = null
+  browserSelection = null
 }
--- a/src/Type/y-xml/utils.js
+++ b/src/Type/y-xml/utils.js
@@ -174,7 +174,7 @@ export function reflectChangesOnDom (events, _document) {
        // let anchorViewPosition = getAnchorViewPosition(yxml._scrollElement)
        if (yxml.constructor === YXmlText) {
          yxml._dom.nodeValue = yxml.toString()
-        } else if (event.attributesChanged !== undefined) {
+        } else {
          // update attributes
          event.attributesChanged.forEach(attributeName => {
            const value = yxml.getAttribute(attributeName)
@@ -193,27 +193,19 @@ export function reflectChangesOnDom (events, _document) {
           *       only in the attributes (above)
           */
          if (event.childListChanged && yxml.constructor !== YXmlHook) {
-            let currentChild = dom.firstChild
+            // create fragment of undeleted nodes
+            const fragment = _document.createDocumentFragment()
            yxml.forEach(function (t) {
-              let expectedChild = t.getDom(_document)
-              if (expectedChild.parentNode === dom) {
-                // is already attached to the dom. Look for it
-                while (currentChild !== expectedChild) {
-                  let del = currentChild
-                  currentChild = currentChild.nextSibling
-                  dom.removeChild(del)
-                }
-                currentChild = currentChild.nextSibling
-              } else {
-                // this dom is not yet attached to dom
-                dom.insertBefore(expectedChild, currentChild)
-              }
+              fragment.appendChild(t.getDom(_document))
            })
-            while (currentChild !== null) {
-              let tmp = currentChild.nextSibling
-              dom.removeChild(currentChild)
-              currentChild = tmp
+            // remove remainding nodes
+            let lastChild = dom.lastChild
+            while (lastChild !== null) {
+              dom.removeChild(lastChild)
+              lastChild = dom.lastChild
            }
+            // insert fragment of undeleted nodes
+            dom.appendChild(fragment)
          }
        }
        /* TODO: smartscrolling
--- a/src/Util/ID.js
+++ b/src/Util/ID.js
@@ -11,10 +11,6 @@ export default class ID {
    return id !== null && id.user === this.user && id.clock === this.clock
  }
  lessThan (id) {
-    if (id.constructor === ID) {
-      return this.user < id.user || (this.user === id.user && this.clock < id.clock)
-    } else {
-      return false
-    }
+    return this.user < id.user || (this.user === id.user && this.clock < id.clock)
  }
 }
--- a/src/Util/NamedEventHandler.js
+++ b/src/Util/NamedEventHandler.js
@@ -1,7 +1,6 @@
 export default class NamedEventHandler {
  constructor () {
    this._eventListener = new Map()
-    this._stateListener = new Map()
  }
  _getListener (name) {
    let listeners = this._eventListener.get(name)
@@ -22,32 +21,16 @@ export default class NamedEventHandler {
    let listeners = this._getListener(name)
    listeners.on.add(f)
  }
-  _initStateListener (name) {
-    let state = this._stateListener.get(name)
-    if (state === undefined) {
-      state = {}
-      state.promise = new Promise(function (resolve) {
-        state.resolve = resolve
-      })
-      this._stateListener.set(name, state)
-    }
-    return state
-  }
-  when (name) {
-    return this._initStateListener(name).promise
-  }
  off (name, f) {
    if (name == null || f == null) {
      throw new Error('You must specify event name and function!')
    }
    const listener = this._eventListener.get(name)
    if (listener !== undefined) {
-      listener.on.delete(f)
-      listener.once.delete(f)
+      listener.remove(f)
    }
  }
  emit (name, ...args) {
-    this._initStateListener(name).resolve()
    const listener = this._eventListener.get(name)
    if (listener !== undefined) {
      listener.on.forEach(f => f.apply(null, args))
--- a/src/Util/RootID.js
+++ b/src/Util/RootID.js
@@ -12,10 +12,6 @@ export default class RootID {
    return id !== null && id.user === this.user && id.name === this.name && id.type === this.type
  }
  lessThan (id) {
-    if (id.constructor === RootID) {
-      return this.user < id.user || (this.user === id.user && (this.name < id.name || (this.name === id.name && this.type < id.type)))
-    } else {
-      return true
-    }
+    return this.user < id.user || (this.user === id.user && (this.name < id.name || (this.name === id.name && this.type < id.type)))
  }
 }
--- a/src/Util/UndoManager.js
+++ b/src/Util/UndoManager.js
@@ -4,12 +4,11 @@ class ReverseOperation {
  constructor (y, transaction) {
    this.created = new Date()
    const beforeState = transaction.beforeState
+    this.toState = new ID(y.userID, y.ss.getState(y.userID) - 1)
    if (beforeState.has(y.userID)) {
-      this.toState = new ID(y.userID, y.ss.getState(y.userID) - 1)
      this.fromState = new ID(y.userID, beforeState.get(y.userID))
    } else {
-      this.toState = null
-      this.fromState = null
+      this.fromState = this.toState
    }
    this.deletedStructs = transaction.deletedStructs
  }
@@ -31,32 +30,28 @@ function applyReverseOperation (y, scope, reverseBuffer) {
    while (!performedUndo && reverseBuffer.length > 0) {
      let undoOp = reverseBuffer.pop()
      // make sure that it is possible to iterate {from}-{to}
-      if (undoOp.fromState !== null) {
-        y.os.getItemCleanStart(undoOp.fromState)
-        y.os.getItemCleanEnd(undoOp.toState)
-        y.os.iterate(undoOp.fromState, undoOp.toState, op => {
-          while (op._deleted && op._redone !== null) {
-            op = op._redone
-          }
-          if (op._deleted === false && isStructInScope(y, op, scope)) {
-            performedUndo = true
-            op._delete(y)
-          }
-        })
-      }
+      y.os.getItemCleanStart(undoOp.fromState)
+      y.os.getItemCleanEnd(undoOp.toState)
+      y.os.iterate(undoOp.fromState, undoOp.toState, op => {
+        if (!op._deleted && isStructInScope(y, op, scope)) {
+          performedUndo = true
+          op._delete(y)
+        }
+      })
      for (let op of undoOp.deletedStructs) {
        if (
          isStructInScope(y, op, scope) &&
          op._parent !== y &&
+          !op._parent._deleted &&
          (
-            op._id.user !== y.userID ||
-            undoOp.fromState === null ||
-            op._id.clock < undoOp.fromState.clock ||
-            op._id.clock > undoOp.toState.clock
+            op._parent._id.user !== y.userID ||
+            op._parent._id.clock < undoOp.fromState.clock ||
+            op._parent._id.clock > undoOp.fromState.clock
          )
        ) {
          performedUndo = true
-          op._redo(y)
+          op = op._copy(undoOp.deletedStructs)
+          op._integrate(y)
        }
      }
    }
@@ -73,7 +68,6 @@ export default class UndoManager {
    this._scope = scope
    this._undoing = false
    this._redoing = false
-    this._lastTransactionWasUndo = false
    const y = scope._y
    this.y = y
    y.on('afterTransaction', (y, transaction, remote) => {
@@ -81,29 +75,17 @@ export default class UndoManager {
        let reverseOperation = new ReverseOperation(y, transaction)
        if (!this._undoing) {
          let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null
-          if (
-            this._redoing === false &&
-            this._lastTransactionWasUndo === false &&
-            lastUndoOp !== null &&
-            reverseOperation.created - lastUndoOp.created <= options.captureTimeout
-          ) {
+          if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {
            lastUndoOp.created = reverseOperation.created
-            if (reverseOperation.toState !== null) {
-              lastUndoOp.toState = reverseOperation.toState
-              if (lastUndoOp.fromState === null) {
-                lastUndoOp.fromState = reverseOperation.fromState
-              }
-            }
+            lastUndoOp.toState = reverseOperation.toState
            reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs)
          } else {
-            this._lastTransactionWasUndo = false
            this._undoBuffer.push(reverseOperation)
          }
          if (!this._redoing) {
            this._redoBuffer = []
          }
        } else {
-          this._lastTransactionWasUndo = true
          this._redoBuffer.push(reverseOperation)
        }
      }
--- a/src/Util/mutualExclude.js
+++ b/src/Util/mutualExclude.js
@@ -1,15 +0,0 @@
-
-export function createMutualExclude () {
-  var token = true
-  return function mutualExclude (f) {
-    if (token) {
-      token = false
-      try {
-        f()
-      } catch (e) {
-        console.error(e)
-      }
-      token = true
-    }
-  }
-}
--- a/src/Util/relativePosition.js
+++ b/src/Util/relativePosition.js
@@ -2,31 +2,37 @@ import ID from './ID.js'
 import RootID from './RootID.js'

 export function getRelativePosition (type, offset) {
-  let t = type._start
-  while (t !== null) {
-    if (t._deleted === false) {
-      if (t._length > offset) {
-        return [t._id.user, t._id.clock + offset]
+  if (offset === 0) {
+    return ['startof', type._id.user, type._id.clock || null, type._id.name || null, type._id.type || null]
+  } else {
+    let t = type._start
+    while (t !== null) {
+      if (t._deleted === false) {
+        if (t._length >= offset) {
+          return [t._id.user, t._id.clock + offset - 1]
+        }
+        if (t._right === null) {
+          return [t._id.user, t._id.clock + t._length - 1]
+        }
+        offset -= t._length
      }
-      offset -= t._length
+      t = t._right
    }
-    t = t._right
+    return null
  }
-  return ['endof', type._id.user, type._id.clock || null, type._id.name || null, type._id.type || null]
 }

 export function fromRelativePosition (y, rpos) {
-  if (rpos[0] === 'endof') {
+  if (rpos[0] === 'startof') {
    let id
    if (rpos[3] === null) {
      id = new ID(rpos[1], rpos[2])
    } else {
      id = new RootID(rpos[3], rpos[4])
    }
-    const type = y.os.get(id)
    return {
-      type,
-      offset: type.length
+      type: y.os.get(id),
+      offset: 0
    }
  } else {
    let offset = 0
@@ -36,7 +42,7 @@ export function fromRelativePosition (y, rpos) {
      return null
    }
    if (!struct._deleted) {
-      offset = rpos[1] - struct._id.clock
+      offset = rpos[1] - struct._id.clock + 1
    }
    struct = struct._left
    while (struct !== null) {
--- a/src/Util/simpleDiff.js
+++ b/src/Util/simpleDiff.js
@@ -1,19 +0,0 @@
-
-export default function simpleDiff (a, b) {
-  let left = 0 // number of same characters counting from left
-  let right = 0 // number of same characters counting from right
-  while (left < a.length && left < b.length && a[left] === b[left]) {
-    left++
-  }
-  if (left !== a.length || left !== b.length) {
-    // Only check right if a !== b
-    while (right + left < a.length && right + left < b.length && a[a.length - right - 1] === b[b.length - right - 1]) {
-      right++
-    }
-  }
-  return {
-    pos: left,
-    remove: a.length - left - right,
-    insert: b.slice(left, b.length - right)
-  }
-}
--- a/src/Y.js
+++ b/src/Y.js
@@ -5,7 +5,6 @@ import { generateUserID } from './Util/generateUserID.js'
 import RootID from './Util/RootID.js'
 import NamedEventHandler from './Util/NamedEventHandler.js'
 import UndoManager from './Util/UndoManager.js'
-import { integrateRemoteStructs } from './MessageHandler/integrateRemoteStructs.js'

 import { messageToString, messageToRoomname } from './MessageHandler/messageToString.js'

@@ -22,58 +21,26 @@ import { addStruct as addType } from './Util/structReferences.js'
 import debug from 'debug'
 import Transaction from './Transaction.js'

-import TextareaBinding from './Binding/TextareaBinding.js'
-
-import { toBinary, fromBinary } from './MessageHandler/binaryEncode.js'
-
 export default class Y extends NamedEventHandler {
-  constructor (room, opts, persistence) {
+  constructor (opts) {
    super()
-    this.room = room
-    if (opts != null) {
-      opts.connector.room = room
-    }
-    this._contentReady = false
    this._opts = opts
-    this.userID = generateUserID()
+    this.userID = opts._userID != null ? opts._userID : generateUserID()
    this.share = {}
    this.ds = new DeleteStore(this)
    this.os = new OperationStore(this)
    this.ss = new StateStore(this)
+    this.connector = new Y[opts.connector.name](this, opts.connector)
+    if (opts.persistence != null) {
+      this.persistence = new Y[opts.persistence.name](this, opts.persistence)
+      this.persistence.retrieveContent()
+    } else {
+      this.persistence = null
+    }
+    this.connected = true
    this._missingStructs = new Map()
    this._readyToIntegrate = []
    this._transaction = null
-    this.connector = null
-    this.connected = false
-    let initConnection = () => {
-      if (opts != null) {
-        this.connector = new Y[opts.connector.name](this, opts.connector)
-        this.connected = true
-        this.emit('connectorReady')
-      }
-    }
-    if (persistence != null) {
-      this.persistence = persistence
-      persistence._init(this).then(initConnection)
-    } else {
-      this.persistence = null
-      initConnection()
-    }
-  }
-  _setContentReady () {
-    if (!this._contentReady) {
-      this._contentReady = true
-      this.emit('content')
-    }
-  }
-  whenContentReady () {
-    if (this._contentReady) {
-      return Promise.resolve()
-    } else {
-      return new Promise(resolve => {
-        this.once('content', resolve)
-      })
-    }
  }
  _beforeChange () {}
  transact (f, remote = false) {
@@ -123,6 +90,9 @@ export default class Y extends NamedEventHandler {
  set _start (start) {
    return null
  }
+  get room () {
+    return this._opts.connector.room
+  }
  define (name, TypeConstructor) {
    let id = new RootID(name, TypeConstructor)
    let type = this.os.get(id)
@@ -153,18 +123,11 @@ export default class Y extends NamedEventHandler {
    }
  }
  destroy () {
-    super.destroy()
    this.share = null
-    if (this.connector != null) {
-      if (this.connector.destroy != null) {
-        this.connector.destroy()
-      } else {
-        this.connector.disconnect()
-      }
-    }
-    if (this.persistence !== null) {
-      this.persistence.deinit(this)
-      this.persistence = null
+    if (this.connector.destroy != null) {
+      this.connector.destroy()
+    } else {
+      this.connector.disconnect()
    }
    this.os = null
    this.ds = null
@@ -192,7 +155,7 @@ Y.extend = function extendYjs () {

 // TODO: The following assignments should be moved to yjs-dist
 Y.AbstractConnector = Connector
-Y.AbstractPersistence = Persistence
+Y.Persisence = Persistence
 Y.Array = YArray
 Y.Map = YMap
 Y.Text = YText
@@ -201,17 +164,12 @@ Y.XmlFragment = YXmlFragment
 Y.XmlText = YXmlText
 Y.XmlHook = YXmlHook

-Y.TextareaBinding = TextareaBinding
-
 Y.utils = {
  BinaryDecoder,
  UndoManager,
  getRelativePosition,
  fromRelativePosition,
-  addType,
-  integrateRemoteStructs,
-  toBinary,
-  fromBinary
+  addType
 }

 Y.debug = debug
--- a/test/diff.tests.js
+++ b/test/diff.tests.js
@@ -1,29 +0,0 @@
-import { test } from '../node_modules/cutest/cutest.mjs'
-import simpleDiff from '../src/Util/simpleDiff.js'
-import Chance from 'chance'
-
-function runDiffTest (t, a, b, expected) {
-  let result = simpleDiff(a, b)
-  t.compare(result, expected, `Compare "${a}" with "${b}"`)
-}
-
-test('diff tests', async function diff1 (t) {
-  runDiffTest(t, 'abc', 'axc', { pos: 1, remove: 1, insert: 'x' })
-  runDiffTest(t, 'bc', 'xc', { pos: 0, remove: 1, insert: 'x' })
-  runDiffTest(t, 'ab', 'ax', { pos: 1, remove: 1, insert: 'x' })
-  runDiffTest(t, 'b', 'x', { pos: 0, remove: 1, insert: 'x' })
-  runDiffTest(t, '', 'abc', { pos: 0, remove: 0, insert: 'abc' })
-  runDiffTest(t, 'abc', 'xyz', { pos: 0, remove: 3, insert: 'xyz' })
-  runDiffTest(t, 'axz', 'au', { pos: 1, remove: 2, insert: 'u' })
-  runDiffTest(t, 'ax', 'axy', { pos: 2, remove: 0, insert: 'y' })
-})
-
-test('random diff tests', async function randomDiff (t) {
-  const chance = new Chance(t.getSeed() * 1000000000)
-  let a = chance.word()
-  let b = chance.word()
-  let change = simpleDiff(a, b)
-  let arr = Array.from(a)
-  arr.splice(change.pos, change.remove, ...Array.from(change.insert))
-  t.assert(arr.join('') === b, 'Applying change information is correct')
-})
--- a/test/encode-decode.tests.js
+++ b/test/encode-decode.tests.js
@@ -54,9 +54,6 @@ test('varString', async function varString (t) {
  testEncoding(t, writeVarString, readVarString, 'test!')
  testEncoding(t, writeVarString, readVarString, '☺☺☺')
  testEncoding(t, writeVarString, readVarString, '1234')
-  testEncoding(t, writeVarString, readVarString, '쾟')
-  testEncoding(t, writeVarString, readVarString, '龟') // surrogate length 3
-  testEncoding(t, writeVarString, readVarString, '😝') // surrogate length 4
 })

 test('varString random', async function varStringRandom (t) {
--- a/test/index.html
+++ b/test/index.html
@@ -3,6 +3,6 @@
  <head>
  </head>
  <body>
-    <script type="module" src="./index.js"></script>
+    <script type="module" src="./encode-decode.js"></script>
  </body>
 </html>
--- a/test/index.js
+++ b/test/index.js
@@ -1,6 +0,0 @@
-import './red-black-tree.js'
-import './y-array.tests.js'
-import './y-map.tests.js'
-import './y-xml.tests.js'
-import './encode-decode.tests.js'
-import './diff.tests.js'
--- a/test/y-xml.tests.js
+++ b/test/y-xml.tests.js
@@ -280,6 +280,7 @@ test('deep element insert', async function xml16 (t) {
  deepElement.append(boldElement)
  deepElement.append(attrElement)
  dom0.append(deepElement)
+  console.log(dom0.outerHTML)
  let str0 = dom0.outerHTML
  await flushAll(t, users)
  let str1 = dom1.outerHTML
@@ -339,6 +340,7 @@ test('Filtering remote changes', async function xmlFilteringRemote (t) {
  // check dom
  paragraph.getDom().setAttribute('malicious', 'true')
  span.getDom().setAttribute('malicious', 'true')
+  console.log(xml0.toString())
  // check incoming attributes
  xml1.get(0).get(0).setAttribute('malicious', 'true')
  xml1.insert(0, [new Y.XmlElement('hideMe')])
--- a/tests-lib/helper.js
+++ b/tests-lib/helper.js
@@ -145,7 +145,7 @@ export async function initArrays (t, opts) {
    } else {
      connOpts = Object.assign({ role: 'slave' }, conn)
    }
-    let y = new Y(connOpts.room, {
+    let y = new Y({
      _userID: i, // evil hackery, don't try this at home
      connector: connOpts
    })
--- a/y.js
+++ b/y.js
--- a/y.js.map
+++ b/y.js.map
--- a/y.node.js
+++ b/y.node.js
--- a/y.node.js.map
+++ b/y.node.js.map
--- a/y.test.js
+++ b/y.test.js
--- a/y.test.js.map
+++ b/y.test.js.map