diff --git a/package-lock.json b/package-lock.json
index bb8162ca6..354169b04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3305,18 +3305,18 @@
 			}
 		},
 		"@nextcloud/auth": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-0.3.1.tgz",
-			"integrity": "sha512-kx5VfB2SWG+BNudoggnjQrmxr559rCDANVLnaDDKmCujToxv0l3kNMTBUUcYhSvv8dyYaD/ZTaXBUON9ZLm9lw==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.2.1.tgz",
+			"integrity": "sha512-54g9YPQBFJ+upYMfk5aZhTispuORY/D2R6WdSesJO/hirob7jSpQoUcWuURQj2tssuxADDSgD1rUAiBnbCe1OQ==",
 			"requires": {
-				"@nextcloud/event-bus": "^0.2.0",
-				"core-js": "3.2.1"
+				"@nextcloud/event-bus": "^1.1.2",
+				"core-js": "3.6.1"
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
-					"integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="
+					"version": "3.6.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz",
+					"integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ=="
 				}
 			}
 		},
@@ -3334,6 +3334,30 @@
 				"core-js": "^3.2.1"
 			},
 			"dependencies": {
+				"@nextcloud/auth": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-0.3.1.tgz",
+					"integrity": "sha512-kx5VfB2SWG+BNudoggnjQrmxr559rCDANVLnaDDKmCujToxv0l3kNMTBUUcYhSvv8dyYaD/ZTaXBUON9ZLm9lw==",
+					"requires": {
+						"@nextcloud/event-bus": "^0.2.0",
+						"core-js": "3.2.1"
+					},
+					"dependencies": {
+						"core-js": {
+							"version": "3.2.1",
+							"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
+							"integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="
+						}
+					}
+				},
+				"@nextcloud/event-bus": {
+					"version": "0.2.1",
+					"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-0.2.1.tgz",
+					"integrity": "sha512-yerEPTA5lnJ1JV8qYK6sHMWW8m6fxuMEtptVgv7WnGCy2l5rvxDh9vqwk72qX/Z9i2OrC7Jy382TMYbke8b2Qw==",
+					"requires": {
+						"core-js": "^3.1.4"
+					}
+				},
 				"core-js": {
 					"version": "3.5.0",
 					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.5.0.tgz",
@@ -3348,17 +3372,29 @@
 			"dev": true
 		},
 		"@nextcloud/event-bus": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-0.2.1.tgz",
-			"integrity": "sha512-yerEPTA5lnJ1JV8qYK6sHMWW8m6fxuMEtptVgv7WnGCy2l5rvxDh9vqwk72qX/Z9i2OrC7Jy382TMYbke8b2Qw==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.1.2.tgz",
+			"integrity": "sha512-E+j71+2LkqEdRjKLrmCKS/fEeI/NxSfthvDH2YkxIK0uH4ZSC+nlzmrNOr0Jby3z0qOgA8PH7+vSLU3D8qdTzw==",
 			"requires": {
-				"core-js": "^3.1.4"
+				"@types/semver": "^6.2.0",
+				"core-js": "^3.6.2",
+				"semver": "^6.3.0"
 			},
 			"dependencies": {
+				"@types/semver": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.2.0.tgz",
+					"integrity": "sha512-1OzrNb4RuAzIT7wHSsgZRlMBlNsJl+do6UblR7JMW4oB7bbR+uBEYtUh7gEc/jM84GGilh68lSOokyM/zNUlBA=="
+				},
 				"core-js": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.3.2.tgz",
-					"integrity": "sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg=="
+					"version": "3.6.4",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
 				}
 			}
 		},
@@ -8495,6 +8531,14 @@
 			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
 			"dev": true
 		},
+		"fault": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/fault/-/fault-1.0.3.tgz",
+			"integrity": "sha512-sfFuP4X0hzrbGKjAUNXYvNqsZ5F6ohx/dZ9I0KQud/aiZNwg263r5L9yGB0clvXHCkzXh5W3t7RSHchggYIFmA==",
+			"requires": {
+				"format": "^0.2.2"
+			}
+		},
 		"fb-watchman": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
@@ -9048,6 +9092,11 @@
 				"mime-types": "^2.1.12"
 			}
 		},
+		"format": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
+			"integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs="
+		},
 		"fragment-cache": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -9119,22 +9168,26 @@
 			"dependencies": {
 				"abbrev": {
 					"version": "1.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+					"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 					"optional": true
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+					"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 					"optional": true
 				},
 				"are-we-there-yet": {
 					"version": "1.1.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+					"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 					"optional": true,
 					"requires": {
 						"delegates": "^1.0.0",
@@ -9143,12 +9196,14 @@
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
@@ -9157,32 +9212,38 @@
 				},
 				"chownr": {
 					"version": "1.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+					"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
 					"optional": true
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 					"optional": true
 				},
 				"debug": {
 					"version": "4.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"optional": true,
 					"requires": {
 						"ms": "^2.1.1"
@@ -9190,22 +9251,26 @@
 				},
 				"deep-extend": {
 					"version": "0.6.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+					"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+					"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 					"optional": true
 				},
 				"detect-libc": {
 					"version": "1.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+					"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
 					"optional": true
 				},
 				"fs-minipass": {
 					"version": "1.2.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+					"integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
 					"optional": true,
 					"requires": {
 						"minipass": "^2.2.1"
@@ -9213,12 +9278,14 @@
 				},
 				"fs.realpath": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+					"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 					"optional": true
 				},
 				"gauge": {
 					"version": "2.7.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+					"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 					"optional": true,
 					"requires": {
 						"aproba": "^1.0.3",
@@ -9233,7 +9300,8 @@
 				},
 				"glob": {
 					"version": "7.1.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+					"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
 					"optional": true,
 					"requires": {
 						"fs.realpath": "^1.0.0",
@@ -9246,12 +9314,14 @@
 				},
 				"has-unicode": {
 					"version": "2.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+					"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 					"optional": true
 				},
 				"iconv-lite": {
 					"version": "0.4.24",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"optional": true,
 					"requires": {
 						"safer-buffer": ">= 2.1.2 < 3"
@@ -9259,7 +9329,8 @@
 				},
 				"ignore-walk": {
 					"version": "3.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+					"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
 					"optional": true,
 					"requires": {
 						"minimatch": "^3.0.4"
@@ -9267,7 +9338,8 @@
 				},
 				"inflight": {
 					"version": "1.0.6",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+					"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 					"optional": true,
 					"requires": {
 						"once": "^1.3.0",
@@ -9276,17 +9348,20 @@
 				},
 				"inherits": {
 					"version": "2.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
 					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+					"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
 					"optional": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
@@ -9294,12 +9369,14 @@
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"optional": true
 				},
 				"minimatch": {
 					"version": "3.0.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 					"optional": true,
 					"requires": {
 						"brace-expansion": "^1.1.7"
@@ -9307,12 +9384,14 @@
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"optional": true
 				},
 				"minipass": {
 					"version": "2.3.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
 					"optional": true,
 					"requires": {
 						"safe-buffer": "^5.1.2",
@@ -9321,7 +9400,8 @@
 				},
 				"minizlib": {
 					"version": "1.2.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
 					"optional": true,
 					"requires": {
 						"minipass": "^2.2.1"
@@ -9329,7 +9409,8 @@
 				},
 				"mkdirp": {
 					"version": "0.5.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 					"optional": true,
 					"requires": {
 						"minimist": "0.0.8"
@@ -9337,12 +9418,14 @@
 				},
 				"ms": {
 					"version": "2.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"optional": true
 				},
 				"needle": {
 					"version": "2.3.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
+					"integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
 					"optional": true,
 					"requires": {
 						"debug": "^4.1.0",
@@ -9352,7 +9435,8 @@
 				},
 				"node-pre-gyp": {
 					"version": "0.12.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
+					"integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
 					"optional": true,
 					"requires": {
 						"detect-libc": "^1.0.2",
@@ -9369,7 +9453,8 @@
 				},
 				"nopt": {
 					"version": "4.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"optional": true,
 					"requires": {
 						"abbrev": "1",
@@ -9378,12 +9463,14 @@
 				},
 				"npm-bundled": {
 					"version": "1.0.6",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+					"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 					"optional": true
 				},
 				"npm-packlist": {
 					"version": "1.4.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+					"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
 					"optional": true,
 					"requires": {
 						"ignore-walk": "^3.0.1",
@@ -9392,7 +9479,8 @@
 				},
 				"npmlog": {
 					"version": "4.1.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 					"optional": true,
 					"requires": {
 						"are-we-there-yet": "~1.1.2",
@@ -9403,17 +9491,20 @@
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
 					"optional": true
 				},
 				"once": {
 					"version": "1.4.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 					"optional": true,
 					"requires": {
 						"wrappy": "1"
@@ -9421,17 +9512,20 @@
 				},
 				"os-homedir": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
 					"optional": true
 				},
 				"os-tmpdir": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
 					"optional": true
 				},
 				"osenv": {
 					"version": "0.1.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 					"optional": true,
 					"requires": {
 						"os-homedir": "^1.0.0",
@@ -9440,17 +9534,20 @@
 				},
 				"path-is-absolute": {
 					"version": "1.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 					"optional": true
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
 					"optional": true
 				},
 				"rc": {
 					"version": "1.2.8",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
 					"optional": true,
 					"requires": {
 						"deep-extend": "^0.6.0",
@@ -9461,14 +9558,16 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"bundled": true,
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"optional": true
 						}
 					}
 				},
 				"readable-stream": {
 					"version": "2.3.6",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 					"optional": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
@@ -9482,7 +9581,8 @@
 				},
 				"rimraf": {
 					"version": "2.6.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
 					"optional": true,
 					"requires": {
 						"glob": "^7.1.3"
@@ -9490,37 +9590,44 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 					"optional": true
 				},
 				"sax": {
 					"version": "1.2.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 					"optional": true
 				},
 				"semver": {
 					"version": "5.7.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+					"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
 					"optional": true
 				},
 				"set-blocking": {
 					"version": "2.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 					"optional": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
 					"optional": true
 				},
 				"string-width": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"optional": true,
 					"requires": {
 						"code-point-at": "^1.0.0",
@@ -9530,7 +9637,8 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"optional": true,
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -9538,7 +9646,8 @@
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"optional": true,
 					"requires": {
 						"ansi-regex": "^2.0.0"
@@ -9546,12 +9655,14 @@
 				},
 				"strip-json-comments": {
 					"version": "2.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 					"optional": true
 				},
 				"tar": {
 					"version": "4.4.8",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
 					"optional": true,
 					"requires": {
 						"chownr": "^1.1.1",
@@ -9565,12 +9676,14 @@
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 					"optional": true
 				},
 				"wide-align": {
 					"version": "1.1.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 					"optional": true,
 					"requires": {
 						"string-width": "^1.0.2 || 2"
@@ -9578,12 +9691,14 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 					"optional": true
 				},
 				"yallist": {
 					"version": "3.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
 					"optional": true
 				}
 			}
@@ -9611,6 +9726,11 @@
 			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
 			"dev": true
 		},
+		"fuse.js": {
+			"version": "3.4.5",
+			"resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.4.5.tgz",
+			"integrity": "sha512-s9PGTaQIkT69HaeoTVjwGsLfb8V8ScJLx5XGFcKHg0MqLUH/UZ4EKOtqtXX9k7AFqCGxD1aJmYb8Q5VYDibVRQ=="
+		},
 		"gauge": {
 			"version": "2.7.4",
 			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -10030,6 +10150,11 @@
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true
 		},
+		"highlight.js": {
+			"version": "9.15.10",
+			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz",
+			"integrity": "sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw=="
+		},
 		"hmac-drbg": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -12793,6 +12918,15 @@
 				"signal-exit": "^3.0.0"
 			}
 		},
+		"lowlight": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.12.1.tgz",
+			"integrity": "sha512-OqaVxMGIESnawn+TU/QMV5BJLbUghUfjDWPAtFqDYDmDtr4FnB+op8xM+pR7nKlauHNUHXGt0VgWatFB8voS5w==",
+			"requires": {
+				"fault": "^1.0.2",
+				"highlight.js": "~9.15.0"
+			}
+		},
 		"lru-cache": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -13937,6 +14071,11 @@
 				"wordwrap": "~1.0.0"
 			}
 		},
+		"orderedmap": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-1.0.0.tgz",
+			"integrity": "sha1-2Q/Cuh7QhRkJB9YB3sbmpT+NQbo="
+		},
 		"os-browserify": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -15203,6 +15342,134 @@
 				"sisteransi": "^1.0.3"
 			}
 		},
+		"prosemirror-collab": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/prosemirror-collab/-/prosemirror-collab-1.1.2.tgz",
+			"integrity": "sha512-ew0p0XWlp3PYc4h20hOfix8UPSRaJMRHQQCMoIUzxoiBgGGij/N4pXIY+w/iw5JISgP8QYyOy5arOYnCzFJQlQ==",
+			"requires": {
+				"prosemirror-state": "^1.0.0"
+			}
+		},
+		"prosemirror-commands": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.0.8.tgz",
+			"integrity": "sha512-P9QdkYYBHWsrJ1JztQuHgeZS7DPCcijQduOj9oxFiqK8Fm6eTsVHzU1IwiRBe+FlK7tyQaerhu/F5K8sqnZ1Cw==",
+			"requires": {
+				"prosemirror-model": "^1.0.0",
+				"prosemirror-state": "^1.0.0",
+				"prosemirror-transform": "^1.0.0"
+			}
+		},
+		"prosemirror-dropcursor": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.2.0.tgz",
+			"integrity": "sha512-D7JrvOgN32PmOgfimdDMKCuYp4tGyCulpsd39/Nzvn9A+tCJmM8XY1PB07zkr2vjrjF09WYD3Ifer7Z3pk/YRw==",
+			"requires": {
+				"prosemirror-state": "^1.0.0",
+				"prosemirror-transform": "^1.1.0",
+				"prosemirror-view": "^1.1.0"
+			}
+		},
+		"prosemirror-gapcursor": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz",
+			"integrity": "sha512-k021MtJibWs3NaJI6S9tCXfTZ/kaugFZBndHkkWx3Zfk0QDUO6JfVATpflxADN6DUkRwJ7qWyHlLDWu71hxHFQ==",
+			"requires": {
+				"prosemirror-keymap": "^1.0.0",
+				"prosemirror-model": "^1.0.0",
+				"prosemirror-state": "^1.0.0",
+				"prosemirror-view": "^1.0.0"
+			}
+		},
+		"prosemirror-history": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.0.4.tgz",
+			"integrity": "sha512-Kk2UisC9EzYcsNv+ILiQJWpsu0rbT6+oAAkvseFUHnudtfkmYAJu1+Xp3F0xTTCVmQdSqSLVk8qydllXUUOU4Q==",
+			"requires": {
+				"prosemirror-state": "^1.2.2",
+				"prosemirror-transform": "^1.0.0",
+				"rope-sequence": "^1.2.0"
+			}
+		},
+		"prosemirror-inputrules": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.0.4.tgz",
+			"integrity": "sha512-RhuBghqUgYWm8ai/P+k1lMl1ZGvt6Cs3Xeur8oN0L1Yy+Z5GmsTp3fT8RVl+vJeGkItEAxAit9Qh7yZxixX7rA==",
+			"requires": {
+				"prosemirror-state": "^1.0.0",
+				"prosemirror-transform": "^1.0.0"
+			}
+		},
+		"prosemirror-keymap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.0.2.tgz",
+			"integrity": "sha512-aq3fBT3WMbwGNacUtMbS/mxd87hjJyjtUx5/h3q/P3FiVqHxmeA9snxQsZHYe0cWRziZePun8zw6kHFKLp/DAQ==",
+			"requires": {
+				"prosemirror-state": "^1.0.0",
+				"w3c-keyname": "^2.0.0"
+			}
+		},
+		"prosemirror-model": {
+			"version": "1.7.4",
+			"resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.7.4.tgz",
+			"integrity": "sha512-yxdpPh9Uv5vAOZvmbhg4fsGUK1oHuQs69iX7cFZ0A4Y+AyMMWRCNKUt21uv84HbXb4I180l4pJE8ibaH/SwYiw==",
+			"requires": {
+				"orderedmap": "^1.0.0"
+			}
+		},
+		"prosemirror-schema-list": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.0.4.tgz",
+			"integrity": "sha512-7Y0b6FIG6ATnCcDSLrZfU9yIfOG5Yad3DMNZ9W7GGfMSzdIl0aHExrsIUgviJZjovO2jtLJVbxWGjMR3OrTupA==",
+			"requires": {
+				"prosemirror-model": "^1.0.0",
+				"prosemirror-transform": "^1.0.0"
+			}
+		},
+		"prosemirror-state": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.2.4.tgz",
+			"integrity": "sha512-ViXpXond3BbSL12ENARQGq3Y8igwFMbTcy96xUNK8kfIcfQRlYlgYrBPXIkHC5+QZtbPrYlpuJ2+QyeSlSX9Cw==",
+			"requires": {
+				"prosemirror-model": "^1.0.0",
+				"prosemirror-transform": "^1.0.0"
+			}
+		},
+		"prosemirror-tables": {
+			"version": "0.9.5",
+			"resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-0.9.5.tgz",
+			"integrity": "sha512-RlAF/D7OvnDCOL8B6Qt6KuBkb0w3SedTdrou7wH7Nn2ml7+M5xUalW/h1f7dMD3wjsU47/Cn8zTbEkCDIpIggw==",
+			"requires": {
+				"prosemirror-keymap": "^1.0.0",
+				"prosemirror-model": "^1.0.0",
+				"prosemirror-state": "^1.0.0",
+				"prosemirror-transform": "^1.0.0",
+				"prosemirror-view": "^1.0.0"
+			}
+		},
+		"prosemirror-transform": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.1.5.tgz",
+			"integrity": "sha512-hJyRcwykLrAAj/ziNbVK1P/ensiszWJ2fNwNiDM8ZWYiMPwM4cAd2jptj/znxJfIvaj0S0psWL1+VhKwPNJDSQ==",
+			"requires": {
+				"prosemirror-model": "^1.0.0"
+			}
+		},
+		"prosemirror-utils": {
+			"version": "0.9.6",
+			"resolved": "https://registry.npmjs.org/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz",
+			"integrity": "sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA=="
+		},
+		"prosemirror-view": {
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.12.0.tgz",
+			"integrity": "sha512-PcG2yGW75530a2DMrRPaFLvy83DUUSj0vImAILWUQQ77Rxhl6NnCVSrU8Pk6HooADOAyqDxxToPRoIz97aeZIA==",
+			"requires": {
+				"prosemirror-model": "^1.1.0",
+				"prosemirror-state": "^1.0.0",
+				"prosemirror-transform": "^1.1.0"
+			}
+		},
 		"proto-list": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -16167,6 +16434,11 @@
 				"inherits": "^2.0.1"
 			}
 		},
+		"rope-sequence": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.2.2.tgz",
+			"integrity": "sha1-ScTlwvVKSOmQsFCSZ3HihxvLMc4="
+		},
 		"rsvp": {
 			"version": "4.8.5",
 			"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
@@ -18170,6 +18442,75 @@
 			"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
 			"integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
 		},
+		"tippy.js": {
+			"version": "4.3.5",
+			"resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-4.3.5.tgz",
+			"integrity": "sha512-NDq3efte8nGK6BOJ1dDN1/WelAwfmh3UtIYXXck6+SxLzbIQNZE/cmRSnwScZ/FyiKdIcvFHvYUgqmoGx8CcyA==",
+			"requires": {
+				"popper.js": "^1.14.7"
+			}
+		},
+		"tiptap": {
+			"version": "1.26.4",
+			"resolved": "https://registry.npmjs.org/tiptap/-/tiptap-1.26.4.tgz",
+			"integrity": "sha512-UCH0wufjGdKMuCUydL896sFYXEUWC3bE20h/oONABSf0gull+pqBEm7J1yCl7j50eYa9FiLgUBGPqPTzKLluxQ==",
+			"requires": {
+				"prosemirror-commands": "^1.0.8",
+				"prosemirror-dropcursor": "^1.2.0",
+				"prosemirror-gapcursor": "^1.0.4",
+				"prosemirror-inputrules": "^1.0.4",
+				"prosemirror-keymap": "^1.0.2",
+				"prosemirror-model": "^1.7.4",
+				"prosemirror-state": "^1.2.4",
+				"prosemirror-view": "^1.11.7",
+				"tiptap-commands": "^1.12.3",
+				"tiptap-utils": "^1.8.2"
+			}
+		},
+		"tiptap-commands": {
+			"version": "1.12.3",
+			"resolved": "https://registry.npmjs.org/tiptap-commands/-/tiptap-commands-1.12.3.tgz",
+			"integrity": "sha512-Dck51lePBwuHmkvkJ6+8V3DbInxAhZwtS2mPvVwz74pDUIcy17tCFw1eHUN50JoXIAci7acuxPKO/weVO1JAyw==",
+			"requires": {
+				"prosemirror-commands": "^1.0.8",
+				"prosemirror-inputrules": "^1.0.4",
+				"prosemirror-model": "^1.7.4",
+				"prosemirror-schema-list": "^1.0.4",
+				"prosemirror-state": "^1.2.4",
+				"prosemirror-tables": "^0.9.5",
+				"prosemirror-utils": "^0.9.6",
+				"tiptap-utils": "^1.8.2"
+			}
+		},
+		"tiptap-extensions": {
+			"version": "1.28.4",
+			"resolved": "https://registry.npmjs.org/tiptap-extensions/-/tiptap-extensions-1.28.4.tgz",
+			"integrity": "sha512-UAtxngKifjrMtJFmi3D9RCNC5LJutq4yn1Np0cqJ4dTnvhWR49PqN6gKjlMYyzyutiLLQk+/3GM/E6EfVwmHOA==",
+			"requires": {
+				"lowlight": "^1.12.1",
+				"prosemirror-collab": "^1.1.2",
+				"prosemirror-history": "^1.0.4",
+				"prosemirror-model": "^1.7.4",
+				"prosemirror-state": "^1.2.4",
+				"prosemirror-tables": "^0.9.5",
+				"prosemirror-transform": "^1.1.5",
+				"prosemirror-utils": "^0.9.6",
+				"prosemirror-view": "^1.11.7",
+				"tiptap": "^1.26.4",
+				"tiptap-commands": "^1.12.3"
+			}
+		},
+		"tiptap-utils": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/tiptap-utils/-/tiptap-utils-1.8.2.tgz",
+			"integrity": "sha512-pyx+3p4fICGM7JU1mcsnRx5jXvLrCL8Nm/9yjeWEZXpAC85L/btY0eFo2Oz4+dKg39+1EGNHheodujx3ngw4lQ==",
+			"requires": {
+				"prosemirror-model": "^1.7.4",
+				"prosemirror-state": "^1.2.4",
+				"prosemirror-tables": "^0.9.5",
+				"prosemirror-utils": "^0.9.6"
+			}
+		},
 		"tmp": {
 			"version": "0.0.33",
 			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -18965,6 +19306,11 @@
 				"browser-process-hrtime": "^0.1.2"
 			}
 		},
+		"w3c-keyname": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.1.1.tgz",
+			"integrity": "sha512-8kSrsGClLiL4kb5/pTxglejUlEAPk3GXtkBblSMrQDxKz0NkMRTVTPBZm6QCNqPOCPsdNvae5XfV+RJZgeGXEA=="
+		},
 		"walker": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
diff --git a/package.json b/package.json
index 4f8484287..b573a7c23 100644
--- a/package.json
+++ b/package.json
@@ -28,12 +28,17 @@
 	"dependencies": {
 		"@babel/polyfill": "^7.8.3",
 		"@babel/runtime": "^7.8.3",
+		"@nextcloud/auth": "^1.2.1",
 		"@nextcloud/l10n": "^1.0.1",
 		"@nextcloud/router": "^1.0.0",
 		"@nextcloud/vue": "^1.2.7",
+		"fuse.js": "^3.4.5",
 		"nextcloud-axios": "^0.2.1",
 		"nextcloud-server": "^0.15.10",
 		"nextcloud-vue-collections": "^0.7.1",
+		"tippy.js": "^4.3.5",
+		"tiptap": "^1.26.3",
+		"tiptap-extensions": "^1.28.3",
 		"url-search-params-polyfill": "^7.0.1",
 		"vue": "^2.6.11",
 		"vue-click-outside": "^1.0.7",
diff --git a/src/components/ActivityEntry.vue b/src/components/ActivityEntry.vue
index ca5017187..84e299056 100644
--- a/src/components/ActivityEntry.vue
+++ b/src/components/ActivityEntry.vue
@@ -59,6 +59,8 @@ export default {
 <style scoped lang="scss">
 	.activity {
 		display: flex;
+		padding: 10px;
+
 		.activity--icon {
 			width: 16px;
 			height: 16px;
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index bde96bb86..6cfc5d767 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -21,12 +21,11 @@
   -->
 
 <template>
-	<AppSidebar v-if="currentCard !== null && copiedCard !== null"
-		:actions="toolbarActions"
+	<AppSidebar v-if="currentBoard && currentCard && copiedCard"
 		:title="currentCard.title"
 		:subtitle="subtitle"
 		@close="closeSidebar">
-		<template #action />
+		<template #secondary-actions />
 		<AppSidebarTab :order="0" name="Details" icon="icon-home">
 			<div class="section-wrapper">
 				<div v-tooltip="t('deck', 'Tags')" class="section-label icon-tag">
@@ -104,24 +103,20 @@
 					type="deck-card" />
 			</div>
 
-			<h5>Description</h5>
+			<h5>{{ t('deck', 'Description') }}</h5>
 			<VueEasymde ref="markdownEditor" v-model="copiedCard.description" :configs="mdeConfig" />
 		</AppSidebarTab>
-		<AppSidebarTab :order="1" name="Attachments" icon="icon-attach">
-			{{ currentCard.attachments }}
-			<button class="icon-upload" @click="clickAddNewAttachmment()">
-				{{ t('deck', 'Upload attachment') }}
-			</button>
+
+		<AppSidebarTab :order="1" :name="t('deck', 'Attachments')" icon="icon-attach">
+			<CardSidebarTabAttachments :card="currentCard" />
 		</AppSidebarTab>
-		<AppSidebarTab :order="2" name="Timeline" icon="icon-activity">
-			<div v-if="isLoading" class="icon icon-loading" />
-			<ActivityEntry v-for="entry in cardActivity"
-				v-else
-				:key="entry.activity_id"
-				:activity="entry" />
-			<button v-if="activityLoadMore" @click="loadMore">
-				Load More
-			</button>
+
+		<AppSidebarTab :order="2" :name="t('deck', 'Comments')" icon="icon-comment">
+			<CardSidebarTabComments :card="currentCard" />
+		</AppSidebarTab>
+
+		<AppSidebarTab :order="3" :name="t('deck', 'Timeline')" icon="icon-activity">
+			<CardSidebarTabActivity :card="currentCard" />
 		</AppSidebarTab>
 	</AppSidebar>
 </template>
@@ -136,14 +131,16 @@ import { mapState } from 'vuex'
 import VueEasymde from 'vue-easymde/dist/VueEasyMDE.common'
 import { Actions } from '@nextcloud/vue/dist/Components/Actions'
 import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
-import ActivityEntry from '../ActivityEntry'
 import Color from '../../mixins/color'
 import { CollectionList } from 'nextcloud-vue-collections'
 
+import CardSidebarTabAttachments from './CardSidebarTabAttachments'
+import CardSidebarTabComments from './CardSidebarTabComments'
+import CardSidebarTabActivity from './CardSidebarTabActivity'
+
 export default {
 	name: 'CardSidebar',
 	components: {
-		ActivityEntry,
 		AppSidebar,
 		AppSidebarTab,
 		Multiselect,
@@ -153,6 +150,9 @@ export default {
 		ActionButton,
 		Avatar,
 		CollectionList,
+		CardSidebarTabAttachments,
+		CardSidebarTabComments,
+		CardSidebarTabActivity,
 	},
 	mixins: [
 		Color,
@@ -167,7 +167,6 @@ export default {
 		return {
 			assignedUsers: null,
 			addedLabelToCard: null,
-			isLoading: false,
 			copiedCard: null,
 			allLabels: null,
 			desc: null,
@@ -180,20 +179,12 @@ export default {
 			},
 			lastModifiedRelative: null,
 			lastCreatedRemative: null,
-			params: {
-				type: 'filter',
-				since: 0,
-				object_type: 'deck_card',
-				object_id: this.id,
-			},
 		}
 	},
 	computed: {
 		...mapState({
 			currentBoard: state => state.currentBoard,
 			assignableUsers: state => state.assignableUsers,
-			cardActivity: 'activity',
-			activityLoadMore: 'activityLoadMore',
 		}),
 		currentCard() {
 			return this.$store.getters.cardById(this.id)
@@ -201,24 +192,6 @@ export default {
 		subtitle() {
 			return t('deck', 'Modified') + ': ' + this.lastModifiedRelative + ' ' + t('deck', 'Created') + ': ' + this.lastCreatedRemative
 		},
-		toolbarActions() {
-			return [
-				{
-					action: () => {
-
-					},
-					icon: 'icon-archive-dark',
-					text: t('deck', 'Assign to me'),
-				},
-				{
-					action: () => {
-
-					},
-					icon: 'icon-archive',
-					text: t('deck', (this.showArchived ? 'Unarchive card' : 'Archive card')),
-				},
-			]
-		},
 	},
 	watch: {
 		'currentCard': {
@@ -236,9 +209,6 @@ export default {
 
 				this.desc = this.currentCard.description
 				this.updateRelativeTimestamps()
-
-				this.params.object_id = this.id
-				this.loadCardActivity()
 			},
 		},
 
@@ -248,7 +218,6 @@ export default {
 	},
 	created() {
 		setInterval(this.updateRelativeTimestamps, 10000)
-		this.loadCardActivity()
 	},
 	destroyed() {
 		clearInterval(this.updateRelativeTimestamps)
@@ -307,23 +276,6 @@ export default {
 			}
 			this.$store.dispatch('removeLabel', data)
 		},
-		loadCardActivity() {
-			this.isLoading = true
-			this.$store.dispatch('loadActivity', this.params).then(response => {
-				this.isLoading = false
-			})
-		},
-		loadMore() {
-			const array = Object.values(this.cardActivity)
-			const aId = (array[array.length - 1].activity_id)
-
-			this.params.since = aId
-			this.loadCardActivity()
-		},
-		clickAddNewAttachmment() {
-
-		},
-
 	},
 }
 </script>
diff --git a/src/components/card/CardSidebarTabActivity.vue b/src/components/card/CardSidebarTabActivity.vue
new file mode 100644
index 000000000..ccbcfc9f7
--- /dev/null
+++ b/src/components/card/CardSidebarTabActivity.vue
@@ -0,0 +1,98 @@
+<!--
+  - @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
+  -
+  - @author Julius Härtl <jus@bitgrid.net>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<div>
+		<div v-if="isLoading" class="icon icon-loading" />
+		<div v-else>
+			<ActivityEntry v-for="entry in cardActivity"
+
+				:key="entry.activity_id"
+				:activity="entry" />
+		</div>
+		<button v-if="activityLoadMore" @click="loadMore">
+			Load More
+		</button>
+	</div>
+</template>
+
+<script>
+import ActivityEntry from '../ActivityEntry'
+
+import { mapState } from 'vuex'
+
+export default {
+	name: 'CardSidebarTabActivity',
+	components: {
+		ActivityEntry,
+	},
+	props: {
+		card: {
+			type: Object,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			id: 'activity',
+			isLoading: false,
+			params: {
+				type: 'filter',
+				since: 0,
+				object_type: 'deck_card',
+				object_id: this.id,
+			},
+		}
+	},
+	computed: {
+		...mapState({
+			currentBoard: state => state.currentBoard,
+			assignableUsers: state => state.assignableUsers,
+			cardActivity: 'activity',
+			activityLoadMore: 'activityLoadMore',
+		}),
+	},
+	mounted() {
+		this.params.object_id = this.card.id
+		this.loadCardActivity()
+	},
+	methods: {
+		loadCardActivity() {
+			this.isLoading = true
+			this.$store.dispatch('loadActivity', this.params).then(response => {
+				this.isLoading = false
+			})
+		},
+		loadMore() {
+			const array = Object.values(this.cardActivity)
+			const aId = (array[array.length - 1].activity_id)
+
+			this.params.since = aId
+			this.loadCardActivity()
+		},
+	},
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/card/CardSidebarTabAttachments.vue b/src/components/card/CardSidebarTabAttachments.vue
new file mode 100644
index 000000000..100716150
--- /dev/null
+++ b/src/components/card/CardSidebarTabAttachments.vue
@@ -0,0 +1,51 @@
+<!--
+  - @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net>
+  -
+  - @author Julius Härtl <jus@bitgrid.net>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<div>
+		{{ card.attachments }}
+		<button class="icon-upload" @click="clickAddNewAttachmment()">
+			{{ t('deck', 'Upload attachment') }}
+		</button>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'CardSidebarTabAttachments',
+	props: {
+		card: {
+			type: Object,
+			default: null,
+		},
+	},
+	methods: {
+		clickAddNewAttachmment() {
+
+		},
+	},
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/card/CardSidebarTabComments.vue b/src/components/card/CardSidebarTabComments.vue
new file mode 100644
index 000000000..4330b2490
--- /dev/null
+++ b/src/components/card/CardSidebarTabComments.vue
@@ -0,0 +1,293 @@
+<template>
+	<div>
+		<div class="comment--header">
+			<Avatar :user="card.owner.uid" />
+			<span class="has-tooltip username">
+				{{ card.owner.displayname }}
+			</span>
+		</div>
+
+		<div class="comment-form">
+			<form @submit.prevent="createComment()">
+				<EditorContent :editor="editor"
+					:placeholder="t('deck', 'New comment') + ' ...'"
+					class="editor__content"
+					required />
+				<input v-tooltip="t('deck', 'Save')"
+					class="icon-confirm"
+					type="submit"
+					value="">
+			</form>
+		</div>
+
+		<div v-show="showSuggestions" ref="suggestions" class="suggestion-list">
+			<template v-if="hasResults">
+				<div
+					v-for="(user, index) in filteredUsers"
+					:key="user.uid"
+					:class="{ 'is-selected': navigatedUserIndex === index }"
+					class="suggestion-list__item"
+					@click="selectUser(user)">
+					{{ user.displayname }}
+				</div>
+			</template>
+			<div v-else class="suggestion-list__item is-empty">
+				No users found
+			</div>
+		</div>
+
+		<ul v-if="comments[card.id] && comments[card.id].length > 0" id="commentsFeed">
+			<CommentItem v-for="comment in comments[card.id]"
+				:key="comment.id"
+				:comment="comment"
+				@doReload="loadComments" />
+			<a @click="loadMore">
+				Load More
+			</a>
+		</ul>
+		<div v-else-if="isLoading" class="icon icon-loading" />
+		<div v-else class="emptycontent">
+			<div class="icon-comment" />
+			<p>Keine Kommentare bisher. Beginne die Diskussion!</p>
+		</div>
+	</div>
+</template>
+
+<script>
+import Fuse from 'fuse.js'
+import tippy from 'tippy.js'
+import { Editor, EditorContent } from 'tiptap'
+import { Mention } from 'tiptap-extensions'
+
+import { mapState } from 'vuex'
+import { Avatar } from '@nextcloud/vue'
+import CommentItem from './CommentItem'
+
+export default {
+	name: 'CardSidebarTabComments',
+	components: {
+		Avatar,
+		CommentItem,
+		EditorContent,
+	},
+	props: {
+		card: {
+			type: Object,
+			default: undefined,
+		},
+	},
+	data() {
+		return {
+			newComment: '',
+			isLoading: false,
+			limit: 20,
+			offset: 0,
+
+			editor: new Editor({
+				extensions: [
+					new Mention({
+						// a list of all suggested items
+						items: () => {
+							return this.currentBoard.users
+						},
+						// is called when a suggestion starts
+						onEnter: ({
+							items, query, range, command, virtualNode,
+						}) => {
+							this.query = query
+							this.filteredUsers = items
+							this.suggestionRange = range
+							this.renderPopup(virtualNode)
+							// we save the command for inserting a selected mention
+							// this allows us to call it inside of our custom popup
+							// via keyboard navigation and on click
+							this.insertMention = command
+						},
+						// is called when a suggestion has changed
+						onChange: ({
+							items, query, range, virtualNode,
+						}) => {
+							this.query = query
+							this.filteredUsers = items
+							this.suggestionRange = range
+							this.navigatedUserIndex = 0
+							this.renderPopup(virtualNode)
+						},
+						// is called when a suggestion is cancelled
+						onExit: () => {
+							// reset all saved values
+							this.query = null
+							this.filteredUsers = []
+							this.suggestionRange = null
+							this.navigatedUserIndex = 0
+							this.destroyPopup()
+						},
+						// is called on every keyDown event while a suggestion is active
+						onKeyDown: ({ event }) => {
+							// pressing up arrow
+							if (event.keyCode === 38) {
+								this.upHandler()
+								return true
+							}
+							// pressing down arrow
+							if (event.keyCode === 40) {
+								this.downHandler()
+								return true
+							}
+							// pressing enter
+							if (event.keyCode === 13) {
+								this.enterHandler()
+								return true
+							}
+							return false
+						},
+						// is called when a suggestion has changed
+						// this function is optional because there is basic filtering built-in
+						// you can overwrite it if you prefer your own filtering
+						// in this example we use fuse.js with support for fuzzy search
+						onFilter: (items, query) => {
+							if (!query) {
+								return items
+							}
+							const fuse = new Fuse(items, {
+								threshold: 0.2,
+								keys: ['uid', 'displayname'],
+							})
+							return fuse.search(query)
+						},
+					}),
+				],
+				content: '',
+				onUpdate: ({ getHTML }) => {
+					this.newComment = getHTML().replace(/(<p>|<\/p>)/g, '')
+				},
+			}),
+			query: null,
+			suggestionRange: null,
+			filteredUsers: [],
+			navigatedUserIndex: 0,
+			insertMention: () => {},
+			observer: null,
+
+		}
+	},
+	computed: {
+		...mapState({
+			comments: state => state.comment.comments,
+			currentBoard: state => state.currentBoard,
+		}),
+
+		hasResults() {
+			return this.filteredUsers.length
+		},
+		showSuggestions() {
+			return this.query || this.hasResults
+		},
+
+	},
+	watch: {
+		'card': {
+			immediate: true,
+			handler() {
+				this.loadComments()
+			},
+		},
+	},
+	created() {
+	},
+
+	methods: {
+		loadComments() {
+			this.isLoading = true
+			this.card.limit = this.limit
+			this.card.offset = this.offset
+			this.$store.dispatch('listComments', this.card).then(response => {
+				this.isLoading = false
+			})
+		},
+		createComment() {
+			const commentObj = {
+				cardId: this.card.id,
+				comment: this.newComment,
+			}
+			this.$store.dispatch('createComment', commentObj)
+			this.loadComments()
+			this.newComment = ''
+			this.editor.setContent('')
+		},
+		loadMore() {
+			this.offset = this.offset + this.limit
+			this.loadComments()
+		},
+
+		// navigate to the previous item
+		// if it's the first item, navigate to the last one
+		upHandler() {
+			this.navigatedUserIndex = ((this.navigatedUserIndex + this.filteredUsers.length) - 1) % this.filteredUsers.length
+		},
+		// navigate to the next item
+		// if it's the last item, navigate to the first one
+		downHandler() {
+			this.navigatedUserIndex = (this.navigatedUserIndex + 1) % this.filteredUsers.length
+		},
+		enterHandler() {
+			const user = this.filteredUsers[this.navigatedUserIndex]
+			if (user) {
+				this.selectUser(user)
+			}
+		},
+		// we have to replace our suggestion text with a mention
+		// so it's important to pass also the position of your suggestion text
+		selectUser(user) {
+			this.insertMention({
+				range: this.suggestionRange,
+				attrs: {
+					id: user.uid,
+					label: user.displayname,
+				},
+			})
+			this.editor.focus()
+		},
+		// renders a popup with suggestions
+		// tiptap provides a virtualNode object for using popper.js (or tippy.js) for popups
+		renderPopup(node) {
+			if (this.popup) {
+				return
+			}
+			this.popup = tippy(node, {
+				content: this.$refs.suggestions,
+				trigger: 'mouseenter',
+				interactive: true,
+				placement: 'bottom-start',
+				inertia: true,
+				duration: [400, 200],
+				showOnInit: true,
+			})
+			// we have to update tippy whenever the DOM is updated
+			if (MutationObserver) {
+				this.observer = new MutationObserver(() => {
+					this.popup.popperInstance.scheduleUpdate()
+				})
+				this.observer.observe(this.$refs.suggestions, {
+					childList: true,
+					subtree: true,
+					characterData: true,
+				})
+			}
+		},
+		destroyPopup() {
+			if (this.popup) {
+				this.popup.destroy()
+				this.popup = null
+			}
+			if (this.observer) {
+				this.observer.disconnect()
+			}
+		},
+	},
+}
+</script>
+
+<style scoped lang="scss">
+	@import "../../css/comments";
+</style>
diff --git a/src/components/card/CommentItem.vue b/src/components/card/CommentItem.vue
new file mode 100644
index 000000000..27c927923
--- /dev/null
+++ b/src/components/card/CommentItem.vue
@@ -0,0 +1,93 @@
+<template>
+	<li class="comment">
+		<template v-if="!edit">
+			<div class="comment--header">
+				<Avatar :user="comment.actorId" />
+				<span class="has-tooltip username">
+					{{ comment.actorDisplayName }}
+				</span>
+				<Actions @click.stop.prevent>
+					<ActionButton icon="icon-rename" @click="showUpdateForm()">
+						{{ t('deck', 'Update') }}
+					</ActionButton>
+					<ActionButton icon="icon-delete" @click="deleteComment(comment.id)">
+						{{ t('deck', 'Delete') }}
+					</ActionButton>
+				</Actions>
+			</div>
+			<!-- FIXME: Check if input is sanitized -->
+			<p class="comment--content" v-html="comment.message" /><p />
+		</template>
+		<form v-else @submit.prevent="updateComment">
+			<input v-model="commentMsg"
+				type="text"
+				autofocus
+				required>
+			<input v-tooltip="t('deck', 'Save')"
+				class="icon-confirm"
+				type="submit"
+				value="">
+			<input type="submit"
+				value=""
+				class="icon-close"
+				@click.stop.prevent="hideUpdateForm">
+		</form>
+	</li>
+</template>
+
+<script>
+import { Avatar, Actions, ActionButton } from '@nextcloud/vue'
+
+export default {
+	name: 'CommentItem',
+	components: {
+		Avatar,
+		Actions,
+		ActionButton,
+	},
+	props: {
+		comment: {
+			type: Object,
+			default: undefined,
+		},
+	},
+	data() {
+		return {
+			edit: false,
+			commentMsg: '',
+		}
+	},
+
+	methods: {
+
+		showUpdateForm() {
+			this.commentMsg = this.comment.message
+			this.edit = true
+		},
+		hideUpdateForm() {
+			this.commentMsg = ''
+			this.edit = false
+		},
+		updateComment() {
+			const data = {
+				comment: this.commentMsg,
+				cardId: this.comment.cardId,
+				commentId: this.comment.id,
+			}
+			this.$store.dispatch('updateComment', data)
+			this.hideUpdateForm()
+		},
+		deleteComment(commentId) {
+			const data = {
+				commentId: commentId,
+				cardId: this.comment.cardId,
+			}
+			this.$store.dispatch('deleteComment', data)
+		},
+	},
+}
+</script>
+
+<style scoped lang="scss">
+	@import "../../css/comments";
+</style>
diff --git a/src/css/comments.scss b/src/css/comments.scss
new file mode 100644
index 000000000..35c01652d
--- /dev/null
+++ b/src/css/comments.scss
@@ -0,0 +1,44 @@
+.comment-form form {
+	display: flex;
+	flex-grow: 1;
+	position: relative;
+
+	.editor__content::v-deep {
+		flex-grow: 1;
+		margin-left: 44px;
+
+		.ProseMirror {
+			width: 100%;
+		}
+	}
+
+	input[type="submit"] {
+		width: 44px;
+		height: 44px;
+		margin: 0;
+		padding: 13px;
+		background-color: transparent;
+		border: none;
+		opacity: .3;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+	}
+}
+.comment {
+	margin-bottom: 10px;
+}
+.comment--header {
+	display: flex;
+	align-items: center;
+	color: var(--color-text-light);
+
+	.username {
+		flex-grow: 1;
+		padding: 10px;
+	}
+}
+
+.comment--content {
+	margin-left: 44px;
+}
diff --git a/src/helpers/xml.js b/src/helpers/xml.js
new file mode 100644
index 000000000..3c40af3e0
--- /dev/null
+++ b/src/helpers/xml.js
@@ -0,0 +1,81 @@
+const xmlToJson = (xml) => {
+	let obj = {}
+	if (xml.nodeType === 1) {
+		if (xml.attributes.length > 0) {
+			obj['@attributes'] = {}
+			for (let j = 0; j < xml.attributes.length; j++) {
+				const attribute = xml.attributes.item(j)
+				obj['@attributes'][attribute.nodeName] = attribute.nodeValue
+			}
+		}
+	} else if (xml.nodeType === 3) {
+		obj = xml.nodeValue
+	}
+	if (xml.hasChildNodes()) {
+		for (let i = 0; i < xml.childNodes.length; i++) {
+			const item = xml.childNodes.item(i)
+			const nodeName = item.nodeName
+			if (typeof (obj[nodeName]) === 'undefined') {
+				obj[nodeName] = xmlToJson(item)
+			} else {
+				if (typeof obj[nodeName].push === 'undefined') {
+					const old = obj[nodeName]
+					obj[nodeName] = []
+					obj[nodeName].push(old)
+				}
+				obj[nodeName].push(xmlToJson(item))
+			}
+		}
+	}
+	return obj
+}
+const parseXml = (xml) => {
+	let dom = null
+	try {
+		dom = (new DOMParser()).parseFromString(xml, 'text/xml')
+	} catch (e) {
+		console.error('Failed to parse xml document', e)
+	}
+	return dom
+}
+
+const commentToObject = (tag) => {
+	return {
+		cardId: tag['d:prop']['oc:objectId']['#text'],
+		id: tag['d:prop']['oc:id']['#text'],
+		actorId: tag['d:prop']['oc:actorId']['#text'],
+		actorDisplayName: tag['d:prop']['oc:actorDisplayName']['#text'],
+		creationDateTime: tag['d:prop']['oc:creationDateTime']['#text'],
+		message: tag['d:prop']['oc:message']['#text'],
+	}
+}
+
+// FIXME: make this generic and not depending on comments
+const xmlToTagList = (xml) => {
+
+	const json = xmlToJson(parseXml(xml))
+	const list = json['d:multistatus']['d:response']
+
+	// no element
+	if (list === undefined) {
+		return []
+	}
+	const result = []
+
+	// one element
+	if (Array.isArray(list) === false) {
+		result.push(commentToObject(list['d:propstat']))
+
+	// two or more elements
+	} else {
+		for (const index in list) {
+			if (list[index]['d:propstat']['d:status']['#text'] !== 'HTTP/1.1 200 OK') {
+				continue
+			}
+			result.push(commentToObject(list[index]['d:propstat']))
+		}
+	}
+	return result
+}
+
+export default xmlToTagList
diff --git a/src/services/CommentApi.js b/src/services/CommentApi.js
new file mode 100644
index 000000000..111fa275e
--- /dev/null
+++ b/src/services/CommentApi.js
@@ -0,0 +1,126 @@
+/*
+ * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
+ *
+ * @author Michael Weimann <mail@michael-weimann.eu>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import axios from 'nextcloud-axios'
+import { getCurrentUser } from '@nextcloud/auth'
+
+export class CommentApi {
+
+	url(url) {
+		url = `dav/comments/deckCard/${url}`
+		return OC.linkToRemote(url)
+	}
+
+	listComments(card) {
+		return axios({
+			method: 'REPORT',
+			url: this.url(`${card.id}`),
+			data: `<?xml version="1.0" encoding="utf-8" ?>
+			<oc:filter-comments xmlns:D="DAV:" xmlns:oc="http://owncloud.org/ns">
+				<oc:limit>${card.limit}</oc:limit>
+				<oc:offset>${card.offset}</oc:offset>
+			</oc:filter-comments>`,
+		}).then(
+			(response) => {
+				return Promise.resolve(response.data)
+			},
+			(err) => {
+				return Promise.reject(err)
+			}
+		)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+	createComment(commentObj) {
+		return axios({
+			method: 'POST',
+			url: this.url(`${commentObj.cardId}`),
+			data: { actorType: 'users', message: `${commentObj.comment}`, verb: 'comment' },
+		}).then(
+			(response) => {
+				const header = response.headers['content-location']
+				const headerArray = header.split('/')
+				const id = headerArray[headerArray.length - 1]
+
+				const ret = {
+					cardId: (commentObj.cardId).toString(),
+					id: id,
+					uId: getCurrentUser().uid,
+					creationDateTime: (new Date()).toString(),
+					message: commentObj.comment,
+				}
+				return Promise.resolve(ret)
+			},
+			(err) => {
+				return Promise.reject(err)
+			}
+		)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+	updateComment(data) {
+		return axios({
+			method: 'PROPPATCH',
+			url: this.url(`${data.cardId}/${data.commentId}`),
+			data: `<?xml version="1.0"?>
+			<d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">
+				<d:set>
+					<d:prop>
+						<oc:message>${data.comment}</oc:message>
+					</d:prop>
+				</d:set>
+			</d:propertyupdate>`,
+		}).then(
+			(response) => {
+				return Promise.resolve(response.data)
+			},
+			(err) => {
+				return Promise.reject(err)
+			}
+		)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+	deleteComment(data) {
+		return axios({
+			method: 'DELETE',
+			url: this.url(`${data.cardId}/${data.commentId}`),
+		}).then(
+			(response) => {
+				return Promise.resolve(response.data)
+			},
+			(err) => {
+				return Promise.reject(err)
+			}
+		)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+}
diff --git a/src/store/comment.js b/src/store/comment.js
new file mode 100644
index 000000000..0aac6239e
--- /dev/null
+++ b/src/store/comment.js
@@ -0,0 +1,93 @@
+/*
+ * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { CommentApi } from '../services/CommentApi'
+import xmlToTagList from '../helpers/xml'
+import Vue from 'vue'
+
+const apiClient = new CommentApi()
+
+export default {
+	state: {
+		comments: {},
+	},
+	mutations: {
+		addComments(state, commentObj) {
+			if (state.comments[commentObj.cardId] === undefined) {
+				Vue.set(state.comments, commentObj.cardId, commentObj.comments)
+			} else {
+				// FIXME append comments once incremental fetching is implemented
+				// state.comments[commentObj.cardId].push(...commentObj.comments)
+				Vue.set(state.comments, commentObj.cardId, commentObj.comments)
+			}
+		},
+		createComment(state, newComment) {
+			if (state.comments[newComment.cardId] === undefined) {
+				state.comments[newComment.cardId] = []
+			}
+			state.comments[newComment.cardId].push(newComment)
+		},
+		updateComment(state, comment) {
+			const existingIndex = state.comments[comment.cardId].findIndex(_comment => _comment.id === comment.commentId)
+			if (existingIndex !== -1) {
+				state.comments[comment.cardId][existingIndex].message = comment.comment
+			}
+		},
+		deleteComment(state, comment) {
+			const existingIndex = state.comments[comment.cardId].findIndex(_comment => _comment.id === comment.commentId)
+			if (existingIndex !== -1) {
+				state.comments[comment.cardId].splice(existingIndex, 1)
+			}
+		},
+	},
+	actions: {
+		listComments({ commit }, card) {
+			apiClient.listComments(card)
+				.then((comments) => {
+					const commentsJson = xmlToTagList(comments)
+					const returnObj = {
+						cardId: card.id,
+						comments: commentsJson,
+					}
+					commit('addComments', returnObj)
+				})
+		},
+		createComment({ commit }, newComment) {
+			apiClient.createComment(newComment)
+				.then((newComment) => {
+					commit('createComment', newComment)
+				})
+		},
+		deleteComment({ commit }, data) {
+			apiClient.deleteComment(data)
+				.then((retVal) => {
+					commit('deleteComment', data)
+				})
+		},
+		updateComment({ commit }, data) {
+			apiClient.updateComment(data)
+				.then((retVal) => {
+					commit('updateComment', data)
+				})
+		},
+	},
+}
diff --git a/src/store/main.js b/src/store/main.js
index 12770a7e2..fa4fa2168 100644
--- a/src/store/main.js
+++ b/src/store/main.js
@@ -28,6 +28,7 @@ import axios from 'nextcloud-axios'
 import { BoardApi } from './../services/BoardApi'
 import stack from './stack'
 import card from './card'
+import comment from './comment'
 
 Vue.use(Vuex)
 
@@ -44,6 +45,7 @@ export default new Vuex.Store({
 	modules: {
 		stack,
 		card,
+		comment,
 	},
 	strict: debug,
 	state: {
@@ -92,7 +94,7 @@ export default new Vuex.Store({
 			return boards
 		},
 		currentBoardLabels: state => {
-			return state.currentBoard.labels
+			return state.currentBoard ? state.currentBoard.labels : []
 		},
 	},
 	mutations: {