diff --git a/src/components/Editor.tsx b/src/components/Editor.tsx
index 7b145ea..66ea248 100644
--- a/src/components/Editor.tsx
+++ b/src/components/Editor.tsx
@@ -1,9 +1,49 @@
+import * as Y from 'yjs';
+import { EditorState } from '@codemirror/state';
+import { keymap, EditorView } from '@codemirror/view';
+import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
+import {
+  defaultHighlightStyle,
+  syntaxHighlighting,
+} from '@codemirror/language';
+import { yCollab } from 'y-codemirror.next';
+import { onCleanup, onMount } from 'solid-js';
+
 interface EditorProps {
   file: string;
 }
 
 function Editor(props: EditorProps) {
-  return <p>You are editing {props.file}.</p>;
+  let editorDiv;
+  let editorView: EditorView;
+
+  onMount(() => {
+    const doc = new Y.Doc();
+    const state = EditorState.create({
+      doc: doc.getText().toString(),
+      extensions: [
+        EditorView.lineWrapping,
+        history(),
+        keymap.of([...defaultKeymap, ...historyKeymap]),
+        syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+        yCollab(doc.getText(), null),
+      ],
+    });
+    editorView = new EditorView({ state, parent: editorDiv });
+  });
+
+  onCleanup(() => editorView?.destroy());
+
+  return (
+    <div>
+      <p>You are editing {props.file}.</p>
+      <div
+        ref={editorDiv}
+        class="editor-component"
+        style={{ border: '1px solid black' }}
+      />
+    </div>
+  );
 }
 
 export default Editor;