diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78332de9..cc3ea145 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,17 @@
-##v0.1
+## v0.1
 Add real time drawing
 
 - Change file structure and how files are served
 - Fix custom invite URL
 - Automatic connection
 
-##v0.2
+## v0.2
 Basic functionality to allow for more features to be added
+- Instant live documents
+- Data persistence
+- User identity, separation between browser client and user
 
-###v0.2.1
+### v0.2.1
 Room to document based model
 
 - Add sidebar
@@ -18,14 +21,14 @@ Room to document based model
 - Event based WebSocketHandler
 - Change how URLs work
 
-###v0.2.2
+### v0.2.2
 Add document opening/closing
 
 - Change how queued packets work
 - Documents are saved before closed
 - Change protocol again
 
-###v0.2.3
+### v0.2.3
 Flat file data persistence
 
 - Remove ConsoleManager
@@ -35,7 +38,7 @@ Flat file data persistence
 - Complete rework of config system
 - SSL support
 
-###v0.2.4
+### v0.2.4
 User identity
 
 - Change URL parsing
@@ -44,19 +47,55 @@ User identity
 - Sessions are linked to documents
 - Improve toString debug
 
-###v0.2.5
+### v0.2.5
 Multiple clients per user
 
 - Change how sessions are handled
 - Clean up script loading
 - Fix hashcode issues
 
-###v0.2.6
+### v0.2.6
 Design
+
 - Clean up CSS
 - Add changelog
 - Add invite/connected users toolbar
 - "Fix" canvas resize
 - Change/clean up config system
 - Improve client debug
-- Better local user with different handshake
\ No newline at end of file
+- Better local user with different handshake
+
+## v0.3
+Architecture rework
+
+### v0.3.1
+SQL data persistence
+
+- Dockerized server with Maven dependencies
+- Add environment variable config method
+- Fix send rate of client
+- Remove flatfile, add runtime (in memory only) and PostgresSQL database
+- Move frontend to independent HTTP server (nginx)
+
+### v0.3.2
+Rework protocol, document serialization
+
+- Canvas objects instead of points
+- Rename packets to messages
+- Add better serialization/deserialization methods
+
+### v0.3.3
+Rework db, implement document persistence
+
+- Canvas is saved in db
+- Rework user authentication
+
+### v0.3.4
+Document update/delete operations, overhaul db and config
+
+- Fix changes not being saved on canvas close
+- Fix canvas serialization
+- Fix connected clients list
+- Add db creation scripts into version control
+- Overhaul config - improve exceptions
+- Add document update and delete functionality
\ No newline at end of file
diff --git a/README.md b/README.md
index ddfc4b8e..b5a7a200 100644
--- a/README.md
+++ b/README.md
@@ -2,53 +2,4 @@ welcome to the board project
 
 name pending
 
-This project is separated into the server (`board-server`) and the client (`board-web-client`). All files inside `board-web-client` can be served to the browser and are therefore public.
-
-You will need to build and run the `board-server` project before using or contributing to the client or server.
-
-## Building `board-server` 
-
-`board-server` is an HTTP/WebSocket server written in Java 8. Make sure you have the Java 8 JDK and [Apache Maven](https://maven.apache.org/index.html) installed on your system before attempting to build the project.
-
-#### Build Steps
-- Clone this repository to your local machine
-- Run `mvn clean package` in `board-server` to generate server artifact in the newly created `target` folder
-
-Modifying `board-server` will require you to recompile the project and restart the server.
-
-Modifying `board-web-client` only requires you to refresh your browser. If you do not see your new changes, then use `ctrl+F5` to also reset your browser cache.
-
-## Running `board-server`
-
-Once you have built `board-server`, you may run it using using the following command:
-
-    java -jar board-server-xxx.jar --ssl.keystore http
-
-- This starts an HTTP/WebSocket server listening on port 80, which you can connect in your browser at [http://localhost](http://localhost). 
-- All WebSocket connections run on the same port as the HTTP server, and should connect to [ws://localhost/websocket](ws://localhost/websocket). 
-- Stop the server gracefully to save persistent data (`ctrl+c` on Windows terminals). Killing the process may result in data loss from any unsaved persistent data.
-
-### Properties
-
-These can be set in several different ways:
-
-##### `board.properties`
-Create a file called `board.properties` in the working directory of the server and format as the following
-
-    key=value
-    other.key=value with spaces
-
-##### Command line arguments
-
-    java -jar board-server-xxx.jar --key value --other.key "value with spaces"
-File indicates a relative (<working directory>/folder/file.ext) or absolute path (C:/folder/file.ext)
-
-| Flag | Type | Default | Description |
-| --- | ---- | ------- | ----------- |
-| ssl.keystore.path | file | (required) |  Path to the PKCS12 `mykeystore.pfx` containing the private key for the server. Set to `http` to use HTTP without SSL encryption |
-| ssl.passphrase | string | (optional) | Passphrase for `mykeystore.pfx` |
-| document.root.path | file | documentRoot | Should be set to where `board-web-client` is. HTTP requests to a directory (`localhost` or `localhost/folder/`) will be served the `index.html` file of those directories HTTP requests to a file that do not specify an extension (`localhost/file`) will be served a `.html` that corresponds to the requested name
-| data.root.path | file | data | Sets the folder location of the flat file storage |
-| debug.log.traffic | boolean | false | Will print network throughput (read/write) into the console |
-| autosave.interval | integer (seconds) | -1 | Sets how often flat file storage will be saved to disk, or negative value to disable |
-| http.cache.time | integer (seconds) | 0 | How long before a cached item expires. Set to 0 for development purposes so refreshing the page will always load your new changes (equivalent of `crtl+f5`) |
\ No newline at end of file
+Make sure to check out the [Quick Start guide](https://github.com/stzups/Board/wiki/Quick-Start).
\ No newline at end of file
diff --git a/board-database/Dockerfile b/board-database/Dockerfile
new file mode 100644
index 00000000..22fb88e8
--- /dev/null
+++ b/board-database/Dockerfile
@@ -0,0 +1,2 @@
+FROM postgres
+COPY init.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/board-database/init.sql b/board-database/init.sql
new file mode 100644
index 00000000..0334f60a
--- /dev/null
+++ b/board-database/init.sql
@@ -0,0 +1,43 @@
+CREATE DATABASE board;
+
+-- Connect to board database (currently on default postgres database)
+\c board
+REVOKE CONNECT ON DATABASE board FROM PUBLIC;
+REVOKE ALL ON SCHEMA public FROM PUBLIC;
+
+CREATE USER board_room PASSWORD 'changeme';
+GRANT CONNECT ON DATABASE board TO board_room;
+GRANT USAGE ON SCHEMA public TO board_room;
+
+-- Create tables and grant permissions
+CREATE TABLE users(
+    id bigint NOT NULL,
+    owned_documents bigint[] NOT NULL,
+    shared_documents bigint[] NOT NULL,
+    PRIMARY KEY (id)
+);
+GRANT SELECT, INSERT, UPDATE ON users TO board_room;
+
+CREATE TABLE documents(
+    id bigint NOT NULL,
+    owner bigint NOT NULL,
+    name varchar(64) not null,
+    PRIMARY KEY (id)
+);
+GRANT SELECT, INSERT, UPDATE, DELETE ON documents TO board_room;
+
+CREATE TABLE canvases(
+    document bigint NOT NULL,
+    data bytea NOT NULL,
+    PRIMARY KEY (document)
+);
+GRANT SELECT, INSERT, UPDATE, DELETE ON canvases TO board_room;
+
+CREATE TABLE persistent_user_sessions(
+    id bigint NOT NULL,
+    "user" bigint NOT NULL,
+    creation_time timestamp,
+    hashed_token bytea NOT NULL,
+    PRIMARY KEY (id)
+);
+GRANT SELECT, INSERT, DELETE ON persistent_user_sessions TO board_room;
\ No newline at end of file
diff --git a/board-frontend/Dockerfile b/board-frontend/Dockerfile
new file mode 100644
index 00000000..8f4b01f7
--- /dev/null
+++ b/board-frontend/Dockerfile
@@ -0,0 +1,10 @@
+#
+# Nginx
+#
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+WORKDIR /user/share/nginx/html
+
+COPY html .
diff --git a/board-frontend/html/assets/default.png b/board-frontend/html/assets/default.png
new file mode 100644
index 00000000..9616f3e9
Binary files /dev/null and b/board-frontend/html/assets/default.png differ
diff --git a/board-web-client/favicon.ico b/board-frontend/html/favicon.ico
similarity index 100%
rename from board-web-client/favicon.ico
rename to board-frontend/html/favicon.ico
diff --git a/board-web-client/index.css b/board-frontend/html/index.css
similarity index 100%
rename from board-web-client/index.css
rename to board-frontend/html/index.css
diff --git a/board-web-client/index.html b/board-frontend/html/index.html
similarity index 78%
rename from board-web-client/index.html
rename to board-frontend/html/index.html
index 422cb63c..99a3c454 100644
--- a/board-web-client/index.html
+++ b/board-frontend/html/index.html
@@ -3,9 +3,9 @@
     <head>
         <meta charset="UTF-8">
         <title>Board | Empty board</title>
-        <link rel="stylesheet" href="/style.css">
-        <link rel="stylesheet" href="/index.css">
-        <script src="/scripts/main.js"></script>
+        <link rel="stylesheet" href="style.css">
+        <link rel="stylesheet" href="index.css">
+        <script src="scripts/main.js"></script>
     </head>
     <body>
         <aside>
diff --git a/board-web-client/scripts/Board.js b/board-frontend/html/scripts/Board.js
similarity index 100%
rename from board-web-client/scripts/Board.js
rename to board-frontend/html/scripts/Board.js
diff --git a/board-frontend/html/scripts/Client.js b/board-frontend/html/scripts/Client.js
new file mode 100644
index 00000000..61abfede
--- /dev/null
+++ b/board-frontend/html/scripts/Client.js
@@ -0,0 +1,27 @@
+export default class Client {
+    constructor(id, user) {
+        this.id = id;
+        this.user = user;
+        //tooltip
+        this.icon = document.createElement('img');
+        this.icon.setAttribute('src', 'assets/default.png');
+        this.icon.addEventListener('mouseenter', (event) => {
+            let rect = this.icon.getBoundingClientRect();
+            this.iconTooltip.style.visibility = 'visible';
+            this.iconTooltip.style.top = rect.top + 'px';
+            this.iconTooltip.style.left = rect.left + -50 + 'px';
+        })
+        this.icon.addEventListener('mouseleave', (event) => {
+            this.iconTooltip.style.visibility = 'hidden';
+        })
+        this.iconTooltip = document.createElement('div');
+        if (user != null) {
+            this.iconTooltip.innerText = user.id;
+        }
+        this.iconTooltip.style.position = 'absolute';
+        this.iconTooltip.style.visibility = 'hidden';
+        this.iconTooltip.style.zIndex = '1000';
+        this.iconTooltip.style.color = 'black';
+        document.getElementsByTagName('body')[0].parentNode.appendChild(this.iconTooltip);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/Document.js b/board-frontend/html/scripts/Document.js
new file mode 100644
index 00000000..2fe24ccd
--- /dev/null
+++ b/board-frontend/html/scripts/Document.js
@@ -0,0 +1,182 @@
+import {canvas, Canvas, ctx} from "./canvas/Canvas.js";
+import SidebarItem from './SidebarItem.js';
+import Client from './Client.js'
+import socket from './protocol/WebSocketHandler.js'
+import * as User from "./User.js";
+import ClientMessageOpenDocument from "./protocol/client/messages/ClientMessageOpenDocument.js";
+import ClientMessageCreateDocument from "./protocol/client/messages/ClientMessageCreateDocument.js";
+import ClientMessageHandshake from "./protocol/client/messages/ClientMessageHandshake.js";
+import ServerMessageType from "./protocol/server/ServerMessageType.js";
+import ClientMessageUpdateCanvas from "./protocol/client/messages/ClientMessageUpdateCanvas.js";
+import Shape from "./canvas/canvasObjects/Shape.js";
+import {CanvasObjectType} from "./canvas/CanvasObjectType.js";
+import CanvasObjectWrapper from "./canvas/CanvasObjectWrapper.js";
+import SocketEventType from "./protocol/SocketEventType.js";
+
+const documents = new Map();
+let activeDocument = null;
+export const clientsToolbar = document.getElementById("clientsToolbar");
+
+class Document {
+    constructor(name, id) {
+        this.clients = new Map();
+        this.name = name;
+        this.id = id;
+        this.sidebarItem = new SidebarItem(this.name, () => {
+            if (this.id != null) {
+                if (activeDocument != null) activeDocument.close();
+
+                activeDocument = this;
+                activeDocument.open();
+
+                socket.send(new ClientMessageOpenDocument(this));
+            } else {
+                console.log('id was null', this);
+            }
+        });
+        documents.set(this.id, this);
+        this.canvas = new Canvas();
+    }
+
+    open() {
+        activeDocument = this;
+        inviteButton.style.visibility = 'visible';
+        console.log('opened ' + this.name);
+        this.sidebarItem.setActive(false);
+        //window.history.pushState(document.name, document.title, '/d/' + this.id); todo
+        this.canvas.draw(-1);
+        //this.addClient(localClient);
+    }
+
+    close() {
+        localUpdate();
+        ctx.clearRect(0, 0, canvas.width, canvas.height);//todo a loading screen?
+        this.clients.forEach((client) => {
+            this.removeClient(client.id);
+        })
+    }
+
+    addClient(client) {
+        this.clients.set(client.id, client);
+        clientsToolbar.appendChild(client.icon);
+    }
+
+    removeClient(id) {
+        this.clients.get(id).icon.remove();
+        this.clients.delete(id);
+    }
+}
+
+document.getElementById('add').addEventListener('click', () => {
+    if (activeDocument != null) activeDocument.close();
+    socket.send(new ClientMessageCreateDocument());
+});
+
+window.addEventListener('resize', resizeCanvas);
+function resizeCanvas() {
+    let imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+    let rect = canvas.parentNode.getBoundingClientRect();
+    canvas.width = rect.width;
+    canvas.height = rect.height;
+    ctx.putImageData(imageData, 0, 0);
+    if (activeDocument != null) {
+        activeDocument.canvas.resize();
+    }
+}
+resizeCanvas();
+
+let last = performance.now();
+
+function draw(now) {
+    let dt = (now - last);
+    last = now;
+
+    if (activeDocument != null) {
+        activeDocument.canvas.draw(dt);
+    }
+
+    window.requestAnimationFrame(draw);
+}
+window.requestAnimationFrame(draw);
+
+socket.addMessageListener(ServerMessageType.ADD_CLIENT, (serverMessageAddClient) => {
+    serverMessageAddClient.clients.forEach((value) => {
+        let client = new Client(value.id, User.getUser(value.userId));
+        activeDocument.addClient(client);
+        console.log('Add client ', client);
+    })
+});
+socket.addMessageListener(ServerMessageType.REMOVE_CLIENT, (serverMessageRemoveClient) => {
+    console.log('Remove client ', activeDocument.removeClient(serverMessageRemoveClient.id));
+});
+socket.addMessageListener(ServerMessageType.UPDATE_CANVAS, (serverMessageUpdateCanvas) => {
+    if (activeDocument != null) {
+        activeDocument.canvas.updateMultiple(serverMessageUpdateCanvas.canvasObjectWrappers);
+    } else {
+        console.warn('oops');
+    }
+});
+socket.addMessageListener(ServerMessageType.UPDATE_DOCUMENT, (serverMessageUpdateDocument) => {
+    documents.set(serverMessageUpdateDocument.id, new Document(serverMessageUpdateDocument.name, serverMessageUpdateDocument.id));
+});
+socket.addMessageListener(ServerMessageType.HANDSHAKE, (serverMessageHandshake) => {
+    window.localStorage.setItem('id', serverMessageHandshake.id.toString());
+    window.localStorage.setItem('token', serverMessageHandshake.token.toString());
+})
+socket.addMessageListener(ServerMessageType.OPEN_DOCUMENT, (serverMessageOpenDocument) => {
+    activeDocument.canvas = serverMessageOpenDocument.canvas;
+})
+socket.addEventListener(SocketEventType.OPEN, () => {
+    let id = window.localStorage.getItem('id');
+    if (id != null) {
+        id = BigInt(id);
+    } else {
+        id = BigInt(0);
+    }
+    let token = window.localStorage.getItem('token');
+    if (token != null) {
+        token = BigInt(window.localStorage.getItem('token'));
+    } else {
+        token = BigInt(0);
+    }
+    socket.send(new ClientMessageHandshake(id, token));
+    let invite = document.location.href.substring(document.location.href.lastIndexOf("/") + 1);
+    if (invite !== '') {
+        try {
+            let bigint = BigInt(invite);
+            //socket.sendOpen(bigint); todo
+        } catch(e) {
+            console.error('improper invite', invite);
+        }
+    }
+});
+
+const inviteButton = document.getElementById("inviteButton");
+
+inviteButton.addEventListener('click', (event) => {
+    console.log('invite');
+})
+
+const MAX_TIME = 2000;
+const UPDATE_INTERVAL = 1000;
+let lastUpdate = 0;
+let updateCanvas = new Canvas();
+setInterval(localUpdate, UPDATE_INTERVAL);
+function localUpdate() {
+    lastUpdate = window.performance.now();
+    if (updateCanvas.updateCanvasObjects.size > 0) {
+        socket.send(new ClientMessageUpdateCanvas(updateCanvas.updateCanvasObjects));//todo breaks the server when the size is 0
+        updateCanvas.updateCanvasObjects.clear();
+    }
+}
+
+function getDt() {
+    return (window.performance.now() - lastUpdate) / MAX_TIME * 255;
+}
+
+canvas.addEventListener('click', (event) => {
+    let shape = Shape.create(event.offsetX, event.offsetY, 50, 50);
+    let id = (Math.random() - 0.5) * 32000;
+    updateCanvas.update(CanvasObjectType.SHAPE, id, CanvasObjectWrapper.create(getDt(), shape));
+    activeDocument.canvas.insert(CanvasObjectType.SHAPE, id, shape);
+})
\ No newline at end of file
diff --git a/board-web-client/scripts/SidebarItem.js b/board-frontend/html/scripts/SidebarItem.js
similarity index 100%
rename from board-web-client/scripts/SidebarItem.js
rename to board-frontend/html/scripts/SidebarItem.js
diff --git a/board-frontend/html/scripts/User.js b/board-frontend/html/scripts/User.js
new file mode 100644
index 00000000..708e7a3d
--- /dev/null
+++ b/board-frontend/html/scripts/User.js
@@ -0,0 +1,31 @@
+import socket from "./protocol/WebSocketHandler.js";
+import ServerMessageType from "./protocol/server/ServerMessageType.js";
+
+const users = new Map();
+let user = null;
+
+export function getUser(id) {
+    if (id == null) {
+        return user;
+    } else {
+        return users.get(id);
+    }
+}
+
+class User {
+    constructor(id) {
+        this.id = id;
+        users.set(id, this);
+    }
+}
+
+socket.addMessageListener(ServerMessageType.HANDSHAKE, (serverMessageHandshake) => {
+    user = new User(serverMessageHandshake.userId);
+})
+socket.addMessageListener(ServerMessageType.ADD_USER, (serverMessageAddUser) => {
+    let user = users.get(serverMessageAddUser.user.id);
+    if (user == null) {
+        user = new User(serverMessageAddUser.user.id);
+    }
+    Object.assign(user, serverMessageAddUser.user);
+});
\ No newline at end of file
diff --git a/board-frontend/html/scripts/canvas/Canvas.js b/board-frontend/html/scripts/canvas/Canvas.js
new file mode 100644
index 00000000..a40f9ef1
--- /dev/null
+++ b/board-frontend/html/scripts/canvas/Canvas.js
@@ -0,0 +1,192 @@
+import Shape from "./canvasObjects/Shape.js";
+import {CanvasObjectType} from "./CanvasObjectType.js";
+
+export const canvas = document.getElementById('canvas');
+export const ctx = canvas.getContext('2d');
+
+const MAX_TIME = 2000;//todo copied from document.js
+
+export class Canvas {
+    constructor(reader) {
+        this.canvasObjects = new Map();
+        this.updateCanvasObjects = new Map();
+        if (reader != null) {
+            let length = reader.readUint8();
+            for (let i = 0; i < length; i++) {
+                let type = reader.readUint8();
+                let map = new Map();
+                this.canvasObjects.set(type, map);
+                let lengthJ = reader.readUint16();
+                for (let j = 0; j < lengthJ; j++) {
+                    map.set(reader.readInt16(), getCanvasObject(type, reader));
+                }
+            }
+        }
+    }
+
+    draw(dt) {
+        dt = dt / 2000 * 255;
+        this.updateCanvasObjects.forEach((value, key) => {
+            let map = this.canvasObjects.get(key);
+            if (map == null) {
+                map = new Map();
+                this.canvasObjects.set(key, map);
+            }
+            value.forEach((v, key) => {
+                v.dt -= dt;
+                if (v.dt <= 0) {
+                    map.set(key, v.canvasObject);
+                    value.delete(key);//is this bad? (concurrent modification???)
+                }
+            })
+        });
+        //console.log('draw1', this.canvasObjects);
+        this.canvasObjects.forEach((value, key) => {
+            value.forEach((v, k) => {
+                ctx.save();
+                ctx.translate(value.x, value.y);
+                v.draw();
+                ctx.restore();
+            })
+        })
+        //todo
+        /*this.objects.forEach((type, objects) => {
+            objects.forEach((object) => {
+                object.draw(dt);
+            })*/
+            /*ctx.beginPath();
+            points.forEach((point) => {
+                if (point.dt === 0) {
+                    ctx.stroke();//todo only do this at the end
+                    ctx.moveTo(point.x, point.y);
+                } else {
+                    ctx.lineTo(point.x, point.y);
+                }
+            })
+            ctx.stroke();*/
+        //});
+        /*client draw
+        ctx.beginPath();
+        ctx.moveTo(this.x, this.y);
+        while (this.points.length > 0 && dt > 0) {
+            //console.log(this.points.length);
+            let point = this.points[0];
+            if (point.dt === 255) {
+                this.x = point.x;
+                this.y = point.y;
+                ctx.lineTo(this.x, this.y);
+                this.points.splice(0, 1);
+
+                continue;
+            }
+            if (point.dt === 0) {
+                ctx.stroke();//todo only do this at the end
+                this.x = point.x;
+                this.y = point.y;
+                ctx.moveTo(this.x, this.y);
+                this.points.splice(0, 1);
+                continue;
+            }
+
+            if (dt + point.usedDt < point.dt) {
+                let multiplier = (dt + point.usedDt) / point.dt;
+                ctx.lineTo(lerp(this.x, point.x, multiplier), lerp(this.y, point.y, multiplier));
+
+                point.usedDt += dt;
+                dt = 0;
+            } else {
+                this.x = point.x;
+                this.y = point.y;
+                ctx.lineTo(this.x, this.y);
+
+                dt -= point.dt + point.usedDt;
+
+                this.points.splice(0, 1);
+            }
+        }
+        ctx.stroke();
+         */
+        //todo
+        /*let e = {};
+        e.id = reader.readInt16();
+        let size = reader.readUint16();
+        e.points = [];
+        for (let i = 0; i < size; i++) {
+            let point = {};
+            point.dt = reader.readUint8();
+            point.x = reader.readInt16();
+            point.y = reader.readInt16();
+            point.usedDt = 0;
+            e.points.push(point);
+        }
+        this.dispatchEvent('protocol.updateDocument', e);*/
+    }
+
+    //for remote drawing, places into queue for being updated
+    updateMultiple(updateCanvasObjectWrappers) {
+        updateCanvasObjectWrappers.forEach((value, key) => {
+            let map = this.updateCanvasObjects.get(key);
+            if (map == null) {
+                map = new Map();
+                this.updateCanvasObjects.set(key, map);
+            }
+            value.forEach((v, k) => {
+                map.set(k, v);
+            });
+        });
+    }
+
+    update(canvasObjectType, id, canvasObjectWrapper) {
+        let map = this.updateCanvasObjects.get(canvasObjectType);
+        if (map == null) {
+            map = new Map();
+            this.updateCanvasObjects.set(canvasObjectType, map);
+        }
+        map.set(id, canvasObjectWrapper);
+    }
+
+    //for local drawing, updates canvas instantly
+    insert(type, id, canvasObject) {
+        let map = this.canvasObjects.get(type);
+        if (map == null) {
+            map = new Map();
+            this.canvasObjects.set(type, map);
+        }
+        map.set(id, canvasObject);//todo random id is bad
+    }
+
+    delete(deleteCanvasObjects) {
+        deleteCanvasObjects.forEach((value, key) => {
+            let map = this.canvasObjects.get(key);
+            if (map == null) {
+                console.warn('cant delete ' + key + ' its already gone');
+            } else {
+                value.forEach((v, k) => {
+                    map.remove(k);
+                });
+            }
+        });
+    }
+
+    resize() {
+
+        //todo redraw?
+    }
+}
+
+function lerp(v0, v1, t) {
+    return v0 * (1 - t) + v1 * t;
+}
+
+
+export function getCanvasObject(type, reader) {
+    let object;
+    switch (type) {
+        case CanvasObjectType.SHAPE:
+            object = new Shape(reader);
+            break;
+        default:
+            console.error('unknown type ' + type);
+    }
+    return object;
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/canvas/CanvasObject.js b/board-frontend/html/scripts/canvas/CanvasObject.js
new file mode 100644
index 00000000..772b1717
--- /dev/null
+++ b/board-frontend/html/scripts/canvas/CanvasObject.js
@@ -0,0 +1,17 @@
+import {ctx} from "./Canvas.js";
+
+export default class CanvasObject {
+    constructor(reader) {
+        this.x = reader.readInt16();
+        this.y = reader.readInt16();
+    }
+
+    draw() {
+        ctx.fillRect(0, 0, 3, 3);
+    }
+
+    serialize(writer) {
+        writer.writeInt16(this.x);
+        writer.writeInt16(this.y);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/canvas/CanvasObjectType.js b/board-frontend/html/scripts/canvas/CanvasObjectType.js
new file mode 100644
index 00000000..411d103e
--- /dev/null
+++ b/board-frontend/html/scripts/canvas/CanvasObjectType.js
@@ -0,0 +1,3 @@
+export const CanvasObjectType = {
+    SHAPE:0,
+}
diff --git a/board-frontend/html/scripts/canvas/CanvasObjectWrapper.js b/board-frontend/html/scripts/canvas/CanvasObjectWrapper.js
new file mode 100644
index 00000000..a503b6e7
--- /dev/null
+++ b/board-frontend/html/scripts/canvas/CanvasObjectWrapper.js
@@ -0,0 +1,20 @@
+import {getCanvasObject} from "./Canvas.js";
+
+export default class CanvasObjectWrapper {
+    constructor(type, reader) {
+        this.dt = reader.readUint8();
+        this.canvasObject = getCanvasObject(type, reader);
+    }
+
+    serialize(writer) {
+        writer.writeUint8(this.dt);
+        this.canvasObject.serialize(writer);
+    }
+
+    static create(dt, canvasObject) {
+        let object = Object.create(this.prototype);
+        object.dt = dt;
+        object.canvasObject = canvasObject;
+        return object;
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/canvas/canvasObjects/Shape.js b/board-frontend/html/scripts/canvas/canvasObjects/Shape.js
new file mode 100644
index 00000000..910282ab
--- /dev/null
+++ b/board-frontend/html/scripts/canvas/canvasObjects/Shape.js
@@ -0,0 +1,29 @@
+import CanvasObject from "../CanvasObject.js";
+import {ctx} from "../Canvas.js";
+
+export default class Shape extends CanvasObject {
+    constructor(reader) {
+        super(reader);
+        this.width = reader.readUint16();
+        this.height = reader.readUint16();
+    }
+
+    draw() {
+        ctx.fillRect(this.x, this.y, this.width, this.height);
+    }
+
+    serialize(writer) {
+        super.serialize(writer);
+        writer.writeInt16(this.width);
+        writer.writeInt16(this.height);
+    }
+
+    static create(x, y, width, height) {
+        let shape = Object.create(this.prototype);
+        shape.x = x;
+        shape.y = y;
+        shape.width = width;
+        shape.height = height;
+        return shape;
+    }
+}
\ No newline at end of file
diff --git a/board-web-client/scripts/main.js b/board-frontend/html/scripts/main.js
similarity index 77%
rename from board-web-client/scripts/main.js
rename to board-frontend/html/scripts/main.js
index 9185a21e..1c2de38f 100644
--- a/board-web-client/scripts/main.js
+++ b/board-frontend/html/scripts/main.js
@@ -2,5 +2,5 @@ const Board = {};
 
 let script = document.createElement('script');
 script.type = "module"
-script.src = "/scripts/Board.js";
+script.src = "./scripts/Board.js";
 document.head.appendChild(script);
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/BufferReader.js b/board-frontend/html/scripts/protocol/BufferReader.js
new file mode 100644
index 00000000..f4b9d040
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/BufferReader.js
@@ -0,0 +1,76 @@
+export default class BufferReader {
+    constructor(buffer) {
+        this.position = 0;
+        this.view = new DataView(buffer);
+    }
+
+    hasNext() {
+        return this.position < this.view.byteLength;
+    }
+
+    readString() {//todo improve performance
+        let length = this.readUint8();
+        this.position += length;
+        return new TextDecoder().decode(this.view.buffer.slice(this.position - length, this.position));
+    }
+
+    readInt8() {
+        let value = this.view.getInt8(this.position);
+        this.position += 1;
+        return value;
+    }
+
+    readUint8() {
+        let value = this.view.getUint8(this.position);
+        this.position += 1;
+        return value;
+    }
+
+    readInt16() {
+        let value = this.view.getInt16(this.position);
+        this.position += 2;
+        return value;
+    }
+
+    readUint16() {
+        let value = this.view.getUint16(this.position);
+        this.position += 2;
+        return value;
+    }
+
+    readInt32() {
+        let value = this.view.getInt32(this.position);
+        this.position += 4;
+        return value;
+    }
+
+    readUint32() {
+        let value = this.view.getUint32(this.position);
+        this.position += 4;
+        return value;
+    }
+
+    readBigInt64() {
+        let value = this.view.getBigInt64(this.position);
+        this.position += 8;
+        return value;
+    }
+
+    readBigUInt64() {
+        let value = this.view.getBigUint64(this.position);
+        this.position += 8;
+        return value;
+    }
+
+    readFloat32() {
+        let value = this.view.getFloat32(this.position);
+        this.position += 4;
+        return value;
+    }
+
+    readFloat64() {
+        let value = this.view.getFloat64(this.position);
+        this.position += 8;
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/BufferWriter.js b/board-frontend/html/scripts/protocol/BufferWriter.js
new file mode 100644
index 00000000..295c53d0
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/BufferWriter.js
@@ -0,0 +1,97 @@
+export default class BufferWriter {//todo rename to buffered buffer writer?
+    constructor(size) {
+        if (size == null) {
+            size = 0;
+        }
+        this.position = 0;
+        this.view = new DataView(new ArrayBuffer(size));
+    }
+
+    writeString(value) {//todo improve performance
+        this.writeUint8(value);
+        return new TextDecoder().decode(this.view.buffer.slice(this.position, this.position + length));
+    }
+
+    writeInt8(value) {
+        this.checkResize(1);
+        this.view.setInt8(this.position, value);
+        this.position += 1;
+    }
+
+    writeUint8(value) {
+        this.checkResize(1);
+        this.view.setUint8(this.position, value);
+        this.position += 1;
+    }
+
+    writeInt16(value) {
+        this.checkResize(2);
+        this.view.setInt16(this.position, value);
+        this.position += 2;
+    }
+
+    writeUint16(value) {
+        this.checkResize(2);
+        this.view.setUint16(this.position, value);
+        this.position += 2;
+    }
+
+    writeInt32(value) {
+        this.checkResize(4);
+        this.view.setInt32(this.position, value);
+        this.position += 4;
+    }
+
+    writeUint32(value) {
+        this.checkResize(4);
+        this.view.setUint32(this.position, value);
+        this.position += 4;
+    }
+
+    writeBigInt64(value) {
+        this.checkResize(8);
+        this.view.setBigInt64(this.position, value);
+        this.position += 8;
+    }
+
+    writeBigUInt64(value) {
+        this.checkResize(8);
+        this.view.setBigUint64(this.position, value);
+        this.position += 8;
+    }
+
+    writeFloat32(value) {
+        this.checkResize(4);
+        this.view.setFloat32(this.position, value);
+        this.position += 4;
+    }
+
+    writeFloat64(value) {
+        this.checkResize(1);
+        this.view.setFloat64(this.position, value);
+        this.position += 8;
+    }
+
+    checkResize(extraLength) {//todo not very efficient
+        let targetLength = this.position + extraLength;
+        if (targetLength > this.view.byteLength) {
+            let buffer = new ArrayBuffer(targetLength);
+            copy(this.view.buffer, buffer)
+            this.view = new DataView(buffer);
+        }
+    }
+
+    getBuffer() {
+        if (this.view.byteLength > this.position) {
+            return this.view.buffer.slice(0, this.position);
+        } else {
+            return this.view.buffer;
+        }
+    }
+}
+
+function copy(sourceBuffer, destinationBuffer) {
+    let sourceArray = new Uint8Array(sourceBuffer);
+    let destinationArray = new Uint8Array(destinationBuffer);
+    destinationArray.set(sourceArray);
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/SocketEventType.js b/board-frontend/html/scripts/protocol/SocketEventType.js
new file mode 100644
index 00000000..18abff39
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/SocketEventType.js
@@ -0,0 +1,5 @@
+let SocketEventType;
+export default SocketEventType = {
+    OPEN:0,
+    CLOSE:1,
+};
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/WebSocketHandler.js b/board-frontend/html/scripts/protocol/WebSocketHandler.js
new file mode 100644
index 00000000..90aafc10
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/WebSocketHandler.js
@@ -0,0 +1,90 @@
+import BufferReader from './BufferReader.js'
+import BufferWriter from "./BufferWriter.js";
+import ServerMessageType from "./server/ServerMessageType.js";
+import SocketEventType from "./SocketEventType.js";
+import {getServerMessage} from "./server/ServerMessageType.js";
+
+const HTTP_PORT = 8080;
+const HTTPS_PORT = 443;
+
+class WebSocketHandler {
+    constructor() {
+        this.socketEvents = {};
+        Object.keys(SocketEventType).forEach((key, value) => {
+            this.socketEvents[value] = [];
+        });
+
+        this.serverMessageEvents = {};
+        Object.keys(ServerMessageType).forEach((key, value) => {
+            this.serverMessageEvents[value] = [];
+        });
+
+        let webSocketUrl;
+        if (window.location.protocol === 'https:') {
+            webSocketUrl = 'wss://localhost:' + HTTPS_PORT + '/websocket';
+        } else {
+            console.warn('Insecure connection, this better be a development environment');//todo disable/disallow
+            webSocketUrl = 'ws://localhost:' + HTTP_PORT + '/websocket';
+        }
+        console.log('Opening WebSocket connection to ' + webSocketUrl);
+        this.socket = new WebSocket(webSocketUrl);
+        this.socket.binaryType = 'arraybuffer';
+
+        this.socket.addEventListener('open', (event) => {
+            console.log('WebSocket connection opened');
+            this.dispatchEvent(SocketEventType.OPEN);
+        });
+
+        this.socket.addEventListener('close', (event) => {
+            console.log('WebSocket connection closed');
+            this.dispatchEvent(SocketEventType.CLOSE);
+        });
+    
+        this.socket.addEventListener('message', (event) => {
+            console.warn('recv');
+            if (typeof event.data === 'string') {
+                console.log(event.data);
+            } else {
+                let reader = new BufferReader(event.data);
+                while (reader.hasNext()) {
+                    this.dispatchMessageEvent(getServerMessage(reader.readUint8(), reader));
+                }
+            }
+        });
+
+        this.socket.addEventListener('error', (event) => {
+            console.error('socket error', event);
+        });
+    }
+
+    addEventListener(socketEventType, onSocketEvent) {
+        this.socketEvents[socketEventType].push(onSocketEvent);
+    }
+    
+    dispatchEvent(socketEventType, socketEvent) {
+        console.log('recv', socketEventType, socketEvent);
+        this.socketEvents[socketEventType].forEach(onSocketEvent => onSocketEvent(socketEvent));
+    }
+
+    addMessageListener(serverMessageType, onServerMessage) {
+        this.serverMessageEvents[serverMessageType].push(onServerMessage);
+    }
+
+    dispatchMessageEvent(serverMessage) {
+        console.log('recv', serverMessage.type, serverMessage);
+        this.serverMessageEvents[serverMessage.type].forEach(onServerMessage => onServerMessage(serverMessage));
+    }
+
+    send(message) {
+        if (this.socket.readyState === WebSocket.OPEN) {
+            console.log('send', message);
+            let writer = new BufferWriter(message.getBufferSize());
+            message.serialize(writer);
+            this.socket.send(writer.getBuffer());
+        } else {
+            console.error('tried to send message while websocket was closed', message);
+        }
+    }
+}
+
+export default new WebSocketHandler();
diff --git a/board-frontend/html/scripts/protocol/client/ClientMessage.js b/board-frontend/html/scripts/protocol/client/ClientMessage.js
new file mode 100644
index 00000000..55db1b8b
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/ClientMessage.js
@@ -0,0 +1,18 @@
+export default class ClientMessage {
+    constructor(type) {
+        this.type = type;
+    }
+
+    /**
+     * How many bytes this message needs for serialization.
+     * The buffer must have at least this much space.
+     * @returns {number}
+     */
+    getBufferSize() {
+        return 1;
+    }
+
+    serialize(writer) {
+        writer.writeUint8(this.type);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/client/ClientMessageType.js b/board-frontend/html/scripts/protocol/client/ClientMessageType.js
new file mode 100644
index 00000000..2fe861ca
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/ClientMessageType.js
@@ -0,0 +1,9 @@
+const ClientMessageType = {
+    OPEN_DOCUMENT:0,
+    UPDATE_CANVAS:1,
+    CREATE_DOCUMENT:2,
+    HANDSHAKE:3,
+    DELETE_DOCUMENT:4,
+    UPDATE_DOCUMENT:5
+};
+export default ClientMessageType;
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/client/messages/ClientMessageCreateDocument.js b/board-frontend/html/scripts/protocol/client/messages/ClientMessageCreateDocument.js
new file mode 100644
index 00000000..516412e5
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/messages/ClientMessageCreateDocument.js
@@ -0,0 +1,8 @@
+import ClientMessageType from "../ClientMessageType.js";
+import ClientMessage from "../ClientMessage.js";
+
+export default class ClientMessageCreateDocument extends ClientMessage {
+    constructor() {
+        super(ClientMessageType.CREATE_DOCUMENT);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/client/messages/ClientMessageDeleteDocument.js b/board-frontend/html/scripts/protocol/client/messages/ClientMessageDeleteDocument.js
new file mode 100644
index 00000000..8a7a5709
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/messages/ClientMessageDeleteDocument.js
@@ -0,0 +1,18 @@
+import ClientMessageType from "../ClientMessageType.js";
+import ClientMessage from "../ClientMessage.js";
+
+export default class ClientMessageDeleteDocument extends ClientMessage {
+    constructor(document) {
+        super(ClientMessageType.DELETE_DOCUMENT);
+        this.id = document.id;
+    }
+
+    getBufferSize() {
+        return super.getBufferSize() + 8;
+    }
+
+    serialize(writer) {
+        super.serialize(writer);
+        writer.writeBigInt64(this.id);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/client/messages/ClientMessageHandshake.js b/board-frontend/html/scripts/protocol/client/messages/ClientMessageHandshake.js
new file mode 100644
index 00000000..10faf107
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/messages/ClientMessageHandshake.js
@@ -0,0 +1,20 @@
+import ClientMessageType from "../ClientMessageType.js";
+import ClientMessage from "../ClientMessage.js";
+
+export default class ClientMessageHandshake extends ClientMessage {
+    constructor(id, token) {
+        super(ClientMessageType.HANDSHAKE);
+        this.id = id;
+        this.token = token;
+    }
+
+    getBufferSize() {
+        return super.getBufferSize() + 16;
+    }
+
+    serialize(writer) {
+        super.serialize(writer);
+        writer.writeBigInt64(this.id);
+        writer.writeBigInt64(this.token);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/client/messages/ClientMessageOpenDocument.js b/board-frontend/html/scripts/protocol/client/messages/ClientMessageOpenDocument.js
new file mode 100644
index 00000000..ce8abb3a
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/messages/ClientMessageOpenDocument.js
@@ -0,0 +1,18 @@
+import ClientMessageType from "../ClientMessageType.js";
+import ClientMessage from "../ClientMessage.js";
+
+export default class ClientMessageOpenDocument extends ClientMessage {
+    constructor(document) {
+        super(ClientMessageType.OPEN_DOCUMENT);
+        this.id = document.id;
+    }
+
+    getBufferSize() {
+        return super.getBufferSize() + 8;
+    }
+
+    serialize(writer) {
+        super.serialize(writer);
+        writer.writeBigInt64(this.id);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/client/messages/ClientMessageUpdateCanvas.js b/board-frontend/html/scripts/protocol/client/messages/ClientMessageUpdateCanvas.js
new file mode 100644
index 00000000..909413ca
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/messages/ClientMessageUpdateCanvas.js
@@ -0,0 +1,22 @@
+import ClientMessageType from "../ClientMessageType.js";
+import ClientMessage from "../ClientMessage.js";
+
+export default class ClientMessageUpdateCanvas extends ClientMessage {
+    constructor(canvasObjects) {
+        super(ClientMessageType.UPDATE_CANVAS);
+        this.canvasObjectWrappers = canvasObjects;//CanvasObjectWrapper
+    }
+
+    serialize(writer) {
+        super.serialize(writer);
+        writer.writeUint8(this.canvasObjectWrappers.size);
+        this.canvasObjectWrappers.forEach((map, canvasObjectType) => {
+            writer.writeUint8(canvasObjectType);
+            writer.writeUint16(map.size);
+            map.forEach((canvasObjectWrapper, id) => {
+                writer.writeInt16(id);
+                canvasObjectWrapper.serialize(writer);
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/client/messages/ClientMessageUpdateDocument.js b/board-frontend/html/scripts/protocol/client/messages/ClientMessageUpdateDocument.js
new file mode 100644
index 00000000..86d8c24f
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/client/messages/ClientMessageUpdateDocument.js
@@ -0,0 +1,19 @@
+import ClientMessageType from "../ClientMessageType.js";
+import ClientMessage from "../ClientMessage.js";
+
+export default class ClientMessageUpdateDocument extends ClientMessage {
+    constructor(document) {
+        super(ClientMessageType.UPDATE_DOCUMENT);
+        this.id = document.id;
+        this.name = document.name;
+    }
+
+    getBufferSize() {
+        return super.getBufferSize() + 8;
+    }
+
+    serialize(writer) {
+        super.serialize(writer);
+        writer.writeBigInt64(this.id);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/ServerMessage.js b/board-frontend/html/scripts/protocol/server/ServerMessage.js
new file mode 100644
index 00000000..8ec6a032
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/ServerMessage.js
@@ -0,0 +1,5 @@
+export default class ServerMessage {
+    constructor(type) {
+        this.type = type;
+    }
+}
diff --git a/board-frontend/html/scripts/protocol/server/ServerMessageType.js b/board-frontend/html/scripts/protocol/server/ServerMessageType.js
new file mode 100644
index 00000000..a83e9541
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/ServerMessageType.js
@@ -0,0 +1,55 @@
+import ServerMessageAddClient from "./messages/ServerMessageAddClient.js";
+import ServerMessageRemoveClient from "./messages/ServerMessageRemoveClient.js";
+import ServerMessageUpdateCanvas from "./messages/ServerMessageUpdateCanvas.js";
+import ServerMessageOpenDocument from "./messages/ServerMessageOpenDocument.js";
+import ServerMessageHandshake from "./messages/ServerMessageHandshake.js";
+import ServerMessageAddUser from "./messages/ServerMessageAddUser.js";
+import ServerMessageDeleteDocument from "./messages/ServerMessageDeleteDocument.js";
+import ServerMessageUpdateDocument from "./messages/ServerMessageUpdateDocument.js";
+
+const ServerMessageType = {
+    ADD_CLIENT:0,
+    REMOVE_CLIENT:1,
+    UPDATE_CANVAS:2,
+    OPEN_DOCUMENT:3,
+    UPDATE_DOCUMENT:4,
+    HANDSHAKE:5,
+    ADD_USER:6,
+    DELETE_DOCUMENT:7
+};
+export default ServerMessageType;
+
+
+export function getServerMessage(type, reader) {
+    let message;
+    switch (type) {
+        case ServerMessageType.ADD_CLIENT:
+            message = new ServerMessageAddClient(reader);
+            break;
+        case ServerMessageType.REMOVE_CLIENT:
+            message = new ServerMessageRemoveClient(reader);
+            break;
+        case ServerMessageType.UPDATE_CANVAS:
+            message = new ServerMessageUpdateCanvas(reader);
+            break;
+        case ServerMessageType.OPEN_DOCUMENT:
+            message = new ServerMessageOpenDocument(reader);
+            break;
+        case ServerMessageType.UPDATE_DOCUMENT:
+            message = new ServerMessageUpdateDocument(reader);
+            break;
+        case ServerMessageType.HANDSHAKE:
+            message = new ServerMessageHandshake(reader);
+            break;
+        case ServerMessageType.ADD_USER:
+            message = new ServerMessageAddUser(reader)
+            break;
+        case ServerMessageType.DELETE_DOCUMENT:
+            message = new ServerMessageDeleteDocument(reader);
+            break;
+        default:
+            console.error('unknown payload type ' + type + ', offset ' + reader.position + ', event ', event);
+            break;
+    }
+    return message;
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageAddClient.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageAddClient.js
new file mode 100644
index 00000000..c65c748e
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageAddClient.js
@@ -0,0 +1,13 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+
+export default class ServerMessageAddClient extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.ADD_CLIENT);
+        this.clients = [];
+        let length = reader.readUint16();
+        for (let i = 0; i < length; i++) {
+            this.clients[i] = {id:reader.readInt16(), userId:reader.readBigInt64()};
+        }
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageAddUser.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageAddUser.js
new file mode 100644
index 00000000..3c13650c
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageAddUser.js
@@ -0,0 +1,10 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+
+export default class ServerMessageAddUser extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.ADD_USER);
+        this.user = {};
+        this.user.id = reader.readBigInt64();
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageDeleteDocument.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageDeleteDocument.js
new file mode 100644
index 00000000..00c8269d
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageDeleteDocument.js
@@ -0,0 +1,9 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+
+export default class ServerMessageDeleteDocument extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.DELETE_DOCUMENT);
+        this.id = reader.readBigInt64();
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageHandshake.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageHandshake.js
new file mode 100644
index 00000000..a937418d
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageHandshake.js
@@ -0,0 +1,10 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+
+export default class ServerMessageHandshake extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.HANDSHAKE);
+        this.id = reader.readBigInt64();
+        this.token = reader.readBigInt64();
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageOpenDocument.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageOpenDocument.js
new file mode 100644
index 00000000..7a3967be
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageOpenDocument.js
@@ -0,0 +1,11 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+import {Canvas} from "../../../canvas/Canvas.js"
+
+export default class ServerMessageOpenDocument extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.OPEN_DOCUMENT);
+        this.id = reader.readBigInt64();
+        this.canvas = new Canvas(reader);
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageRemoveClient.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageRemoveClient.js
new file mode 100644
index 00000000..4d58a286
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageRemoveClient.js
@@ -0,0 +1,9 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+
+export default class ServerMessageRemoveClient extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.REMOVE_CLIENT);
+        this.id = reader.readInt16();
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageUpdateCanvas.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageUpdateCanvas.js
new file mode 100644
index 00000000..fdca0015
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageUpdateCanvas.js
@@ -0,0 +1,20 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+import CanvasObjectWrapper from "../../../canvas/CanvasObjectWrapper.js";
+
+export default class ServerMessageUpdateCanvas extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.UPDATE_CANVAS);
+        this.canvasObjectWrappers = new Map();
+        let length = reader.readUint8();
+        for (let i = 0; i < length; i++) {
+            let type = reader.readUint8();
+            let map = new Map();
+            this.canvasObjectWrappers.set(type, map);
+            let lengthJ = reader.readUint16();
+            for (let j = 0; j < lengthJ; j++) {
+                map.set(reader.readInt16(), new CanvasObjectWrapper(type, reader));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/board-frontend/html/scripts/protocol/server/messages/ServerMessageUpdateDocument.js b/board-frontend/html/scripts/protocol/server/messages/ServerMessageUpdateDocument.js
new file mode 100644
index 00000000..6922cf1d
--- /dev/null
+++ b/board-frontend/html/scripts/protocol/server/messages/ServerMessageUpdateDocument.js
@@ -0,0 +1,10 @@
+import ServerMessage from "../ServerMessage.js";
+import ServerMessageType from "../ServerMessageType.js";
+
+export default class ServerMessageUpdateDocument extends ServerMessage {
+    constructor(reader) {
+        super(ServerMessageType.UPDATE_DOCUMENT);
+        this.id = reader.readBigInt64();
+        this.name = reader.readString();
+    }
+}
\ No newline at end of file
diff --git a/board-web-client/style.css b/board-frontend/html/style.css
similarity index 100%
rename from board-web-client/style.css
rename to board-frontend/html/style.css
diff --git a/board-frontend/nginx.conf b/board-frontend/nginx.conf
new file mode 100644
index 00000000..5ed52fc3
--- /dev/null
+++ b/board-frontend/nginx.conf
@@ -0,0 +1,74 @@
+
+#user  nobody;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+
+    sendfile        off;
+
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        #charset koi8-r;
+
+        #access_log  logs/host.access.log  main;
+
+        location / {
+            root   /user/share/nginx/html;
+            index  index.html index.htm;
+        }
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+
+
+    # HTTPS server
+    #
+    #server {
+    #    listen       443 ssl;
+    #    server_name  localhost;
+
+    #    ssl_certificate      cert.pem;
+    #    ssl_certificate_key  cert.key;
+
+    #    ssl_session_cache    shared:SSL:1m;
+    #    ssl_session_timeout  5m;
+
+    #    ssl_ciphers  HIGH:!aNULL:!MD5;
+    #    ssl_prefer_server_ciphers  on;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+}
diff --git a/board-room/Dockerfile b/board-room/Dockerfile
new file mode 100644
index 00000000..a25794b1
--- /dev/null
+++ b/board-room/Dockerfile
@@ -0,0 +1,28 @@
+#
+# Build server with maven
+#
+FROM maven:3.6.0-jdk-11-slim AS board-room
+
+# Fetch and cache dependencies
+WORKDIR /usr/src/app
+
+COPY pom.xml .
+RUN mvn dependency:resolve
+
+# Compile source code with cached dependencies
+COPY src src
+RUN mvn package
+
+#
+# Runtime (alpine)
+#
+FROM adoptopenjdk/openjdk11:alpine-jre
+
+WORKDIR /usr/app
+
+COPY --from=board-room /usr/src/app/target/board-room-0.3.jar .
+
+# Failure to set required environment variables will cause the server to crash
+ENV board.ssl=required
+ENV board.postgres=required
+ENTRYPOINT ["java", "-jar", "board-room-0.3.jar"]
\ No newline at end of file
diff --git a/board-server/pom.xml b/board-room/pom.xml
similarity index 86%
rename from board-server/pom.xml
rename to board-room/pom.xml
index 3183f094..687f53d4 100644
--- a/board-server/pom.xml
+++ b/board-room/pom.xml
@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.stzups.board</groupId>
-    <artifactId>board-server</artifactId>
-    <version>0.2</version>
+    <artifactId>board-room</artifactId>
+    <version>0.3</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -26,8 +26,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <!-- make runnable jar -->
@@ -39,7 +39,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>net.stzups.board.Board</mainClass>
+                            <mainClass>net.stzups.board.BoardRoom</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
@@ -72,5 +72,10 @@
             <version>4.1.55.Final</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.13</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/board-room/src/main/java/net/stzups/board/BoardConfigKeys.java b/board-room/src/main/java/net/stzups/board/BoardConfigKeys.java
new file mode 100644
index 00000000..3de122ed
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/BoardConfigKeys.java
@@ -0,0 +1,16 @@
+package net.stzups.board;
+
+import net.stzups.board.util.config.ConfigKey;
+import net.stzups.board.util.config.OptionalConfigKey;
+import net.stzups.board.util.config.RequiredConfigKey;
+
+public class BoardConfigKeys {
+    public static final ConfigKey<Boolean> POSTGRES = new RequiredConfigKey<>("postgres");
+    public static final ConfigKey<String> POSTGRES_URL = new RequiredConfigKey<>("postgres.url");
+    public static final ConfigKey<String> POSTGRES_USER = new RequiredConfigKey<>("postgres.user");
+    public static final ConfigKey<String> POSTGRES_PASSWORD = new RequiredConfigKey<>("postgres.password");
+    public static final ConfigKey<Boolean> SSL = new RequiredConfigKey<>("ssl");
+    public static final ConfigKey<String> SSL_KEYSTORE_PATH = new RequiredConfigKey<>("ssl.keystore.path");
+    public static final ConfigKey<String> SSL_KEYSTORE_PASSPHRASE = new RequiredConfigKey<>("ssl.keystore.passphrase");
+    public static final ConfigKey<Boolean> DEBUG_LOG_TRAFFIC = new OptionalConfigKey<>("debug.log.traffic", false);
+}
diff --git a/board-room/src/main/java/net/stzups/board/BoardRoom.java b/board-room/src/main/java/net/stzups/board/BoardRoom.java
new file mode 100644
index 00000000..6d244c7a
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/BoardRoom.java
@@ -0,0 +1,82 @@
+package net.stzups.board;
+
+import io.netty.channel.ChannelFuture;
+import net.stzups.board.util.config.Config;
+import net.stzups.board.util.config.ConfigBuilder;
+import net.stzups.board.util.LogFactory;
+import net.stzups.board.util.config.configs.ArgumentConfig;
+import net.stzups.board.util.config.configs.EnvironmentVariableConfig;
+import net.stzups.board.util.config.configs.PropertiesConfig;
+import net.stzups.board.data.database.Database;
+import net.stzups.board.data.database.memory.MemoryDatabase;
+import net.stzups.board.data.database.postgres.PostgresDatabase;
+import net.stzups.board.server.Server;
+
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.logging.Logger;
+
+public class BoardRoom {
+    private static Logger logger;
+    private static Config config;
+    private static final Random random = new Random();
+
+    private static Database database;//user id -> user
+
+    public static void main(String[] args) throws Exception {
+        logger = LogFactory.getLogger("Board Room");
+
+        logger.info("Starting Board Room server...");
+
+        long start = System.currentTimeMillis();
+
+        config = new ConfigBuilder()
+                .addConfig(new ArgumentConfig(args))
+                .addConfig(new PropertiesConfig("board.properties"))
+                .addConfig(new EnvironmentVariableConfig("board."))
+                .build();
+
+        if (BoardRoom.getConfig().getBoolean(BoardConfigKeys.POSTGRES)) {
+            logger.info("Connecting to Postgres database...");
+            database = new PostgresDatabase(BoardRoom.getConfig().getString(BoardConfigKeys.POSTGRES_URL),
+                    BoardRoom.getConfig().getString(BoardConfigKeys.POSTGRES_USER),
+                    BoardRoom.getConfig().getString(BoardConfigKeys.POSTGRES_PASSWORD));
+            logger.info("Connected to Postgres database");
+        } else {
+            logger.warning("Using debug only runtime database. No data will be persisted.");
+            database = new MemoryDatabase();
+        }
+
+        Server server = new Server();
+        ChannelFuture channelFuture = server.start();
+
+        logger.info("Started Board Room server in " + (System.currentTimeMillis() - start) + "ms");
+
+        channelFuture.sync();
+
+        start = System.currentTimeMillis();
+
+        logger.info("Stopping Board Room server");
+
+        server.stop();
+
+        logger.info("Stopped Board Room server in " + (System.currentTimeMillis() - start) + "ms");
+    }
+
+    public static Logger getLogger() {
+        return logger;
+    }
+
+    public static Config getConfig() {
+        return config;
+    }
+
+    public static Database getDatabase() {
+        return database;
+    }
+
+    public static Random getRandom() {
+        return random;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/database/Database.java b/board-room/src/main/java/net/stzups/board/data/database/Database.java
new file mode 100644
index 00000000..943a6f12
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/database/Database.java
@@ -0,0 +1,26 @@
+package net.stzups.board.data.database;
+
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.data.objects.InviteCode;
+import net.stzups.board.data.objects.User;
+import net.stzups.board.data.objects.PersistentUserSession;
+import net.stzups.board.data.objects.canvas.Canvas;
+
+public interface Database {
+    User createUser();
+    User getUser(long id);
+    void updateUser(User user);
+
+    Document createDocument(User owner);
+    Document getDocument(long id);
+    void updateDocument(Document document);
+    void deleteDocument(Document document);
+    Canvas getCanvas(Document document);
+    void saveCanvas(Canvas canvas);
+
+    InviteCode getInviteCode(String code);
+    InviteCode getInviteCode(Document document);
+
+    PersistentUserSession removeUserSession(long id);
+    void addUserSession(PersistentUserSession persistentUserSession);
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/database/memory/MemoryDatabase.java b/board-room/src/main/java/net/stzups/board/data/database/memory/MemoryDatabase.java
new file mode 100644
index 00000000..ba0abf28
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/database/memory/MemoryDatabase.java
@@ -0,0 +1,91 @@
+package net.stzups.board.data.database.memory;
+
+import net.stzups.board.BoardRoom;
+import net.stzups.board.data.database.Database;
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.data.objects.InviteCode;
+import net.stzups.board.data.objects.User;
+import net.stzups.board.data.objects.PersistentUserSession;
+import net.stzups.board.data.objects.canvas.Canvas;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * In memory database, for debug only
+ */
+public class MemoryDatabase implements Database {
+    private Map<Long, Document> documents = new HashMap<>();
+    private Map<Long, PersistentUserSession> userSessions = new HashMap<>();
+    private Map<Long, User> users = new HashMap<>();
+
+    @Override
+    public User createUser() {
+        User user = new User(BoardRoom.getRandom().nextLong(), new Long[0], new Long[0]);
+        users.put(user.getId(), user);
+        return user;
+    }
+
+    @Override
+    public User getUser(long id) {
+        return users.get(id);
+    }
+
+    @Override
+    public void updateUser(User user) {
+
+    }
+
+    @Override
+    public Document getDocument(long id) {
+        return documents.get(id);
+    }
+
+    @Override
+    public Canvas getCanvas(Document document) {
+        return new Canvas(document);
+    }
+
+    @Override
+    public void saveCanvas(Canvas canvas) {
+
+    }
+
+    @Override
+    public InviteCode getInviteCode(String code) {
+        return null;
+    }
+
+    @Override
+    public InviteCode getInviteCode(Document document) {
+        return null;
+    }
+
+    @Override
+    public void updateDocument(Document document) {
+        documents.put(document.getId(), document);
+    }
+
+    @Override
+    public void deleteDocument(Document document) {
+        documents.remove(document.getId());
+    }
+
+    @Override
+    public PersistentUserSession removeUserSession(long id) {
+        return userSessions.remove(id);
+    }
+
+    @Override
+    public void addUserSession(PersistentUserSession persistentUserSession) {
+        userSessions.put(persistentUserSession.getId(), persistentUserSession);
+    }
+
+    @Override
+    public Document createDocument(User owner) {
+        Document document = new Document(owner);
+        documents.put(document.getId(), document);
+        return document;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/database/postgres/PostgresDatabase.java b/board-room/src/main/java/net/stzups/board/data/database/postgres/PostgresDatabase.java
new file mode 100644
index 00000000..24331bb8
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/database/postgres/PostgresDatabase.java
@@ -0,0 +1,271 @@
+package net.stzups.board.data.database.postgres;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import net.stzups.board.BoardRoom;
+import net.stzups.board.data.database.Database;
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.data.objects.InviteCode;
+import net.stzups.board.data.objects.PersistentUserSession;
+import net.stzups.board.data.objects.User;
+import net.stzups.board.data.objects.canvas.Canvas;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PostgresDatabase implements Database {
+    private Connection connection;
+
+    private Map<Long, Document> documents = new HashMap<>();
+
+    public PostgresDatabase(String url, String user, String password) throws Exception {
+        Class.forName("org.postgresql.Driver");
+        connection = DriverManager.getConnection(url, user, password);
+    }
+
+    @Override
+    public User createUser() {
+        User user = new User(BoardRoom.getRandom().nextLong(), new Long[0], new Long[0]);
+        try (PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO users(id, owned_documents, shared_documents) VALUES (?, ?, ?)")) {
+            preparedStatement.setLong(1, user.getId());
+            preparedStatement.setArray(2, connection.createArrayOf("bigint", user.getOwnedDocuments()));
+            preparedStatement.setArray(3, connection.createArrayOf("bigint", user.getSharedDocuments()));
+            preparedStatement.execute();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return user;
+    }
+
+    @Override
+    public User getUser(long id) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM users WHERE id=?")) {
+            preparedStatement.setLong(1, id);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.next()) {
+                return new User(id,
+                        (Long[]) (resultSet.getArray("owned_documents").getArray()),
+                        (Long[]) (resultSet.getArray("shared_documents").getArray()));
+            } else {
+                BoardRoom.getLogger().warning("User with id " + id + " does not exist");
+                return null;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    public void updateUser(User user) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement("UPDATE users SET owned_documents=?, shared_documents=? WHERE id=?")){
+            preparedStatement.setArray(1, connection.createArrayOf("bigint", user.getOwnedDocuments()));
+            preparedStatement.setArray(2, connection.createArrayOf("bigint", user.getSharedDocuments()));
+            preparedStatement.setLong(3, user.getId());
+            preparedStatement.execute();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+/*
+    // normally (Long[]) resultSet.getArray("something").getArray()) fails with custom domain types
+    private Long[] convertPostgresDomainArrayToLongArray(Array longArray) throws SQLException {
+        Object[] objects = (Object[]) longArray.getArray();
+        Long[] longs = new Long[objects.length];
+        for (int i = 0; i < objects.length; i++) {
+            //objects is actually an array of PGobject
+            longs[i] = Long.parseLong(((PGobject) objects[i]).getValue());
+        }
+        return longs;
+    }*/
+
+    @Override
+    public Document createDocument(User owner) {
+        Document document = new Document(owner);
+        try (PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO documents(id, owner, name) VALUES (?, ?, ?)")){
+            preparedStatement.setLong(1, document.getId());
+            preparedStatement.setLong(2, document.getOwner().getId());
+            preparedStatement.setString(3, document.getName());
+            preparedStatement.execute();
+            documents.put(document.getId(), document);
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+        owner.addOwnedDocument(document);
+        updateUser(owner);
+        return document;
+    }
+
+    @Override
+    public Document getDocument(long id) {
+        Document document = documents.get(id);
+        if (document == null) {
+            try (PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM documents WHERE id=?")) {
+                preparedStatement.setLong(1, id);
+                ResultSet resultSet = preparedStatement.executeQuery();
+                if (resultSet.next()) {
+                    long userId = resultSet.getLong("owner");
+                    User user = getUser(userId);
+                    if (user == null) {
+                        BoardRoom.getLogger().warning("Document with id " + id + " has no owner with id " + userId);
+                        return null;
+                    }
+                    document = new Document(id, user, resultSet.getString("name"));
+                    documents.put(document.getId(), document);
+                } else {
+                    BoardRoom.getLogger().warning("Document with id " + id + " does not exist");
+                    return null;
+                }
+            } catch (SQLException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        return document;
+    }
+
+    @Override
+    public void updateDocument(Document document) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement("UPDATE documents SET name=? WHERE id=?")) {
+            preparedStatement.setString(1, document.getName());
+            preparedStatement.setLong(2, document.getId());
+            preparedStatement.execute();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void deleteDocument(Document document) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM documents WHERE id=?; DELETE FROM canvases WHERE document=?; DELETE FROM invite_codes WHERE document=?")) {
+            preparedStatement.setLong(1, document.getId());
+            preparedStatement.setLong(2, document.getId());
+            preparedStatement.setLong(3, document.getId());
+            preparedStatement.execute();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Canvas getCanvas(Document document) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM canvases WHERE document=?")) {
+            preparedStatement.setLong(1, document.getId());
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.next()) {
+                return new Canvas(document, Unpooled.wrappedBuffer(resultSet.getBinaryStream("data").readAllBytes()));
+            } else {
+                return new Canvas(document);
+            }
+        } catch (SQLException | IOException e) {
+            e.printStackTrace();
+            return null;//todo error handling??
+        }
+    }
+
+    @Override
+    public void saveCanvas(Canvas canvas) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO canvases(document, data) VALUES(?, ?) ON CONFLICT (document) DO UPDATE SET data=excluded.data")) {
+            preparedStatement.setLong(1, canvas.getDocument().getId());
+            ByteBuf byteBuf = Unpooled.buffer();
+            canvas.serialize(byteBuf);
+            preparedStatement.setBinaryStream(2, new ByteArrayInputStream(byteBuf.array()));
+            preparedStatement.execute();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public InviteCode getInviteCode(String code) {//gets a document for an existing invite code
+        try (PreparedStatement preparedStatement = connection.prepareStatement("SELECT document FROM invite_codes WHERE code=?")) {
+            preparedStatement.setString(1, code);
+            ResultSet resultSet = preparedStatement.executeQuery();//todo autocloseable try with resources
+            if (!resultSet.next()) {
+                return null;
+            }
+            return new InviteCode(code, resultSet.getLong(1));
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    public InviteCode getInviteCode(Document document) {//gets an invite code for a document
+        //check if invite code already exists, otherwise generate a new one
+        try (PreparedStatement preparedStatement = connection.prepareStatement("SELECT code FROM invite_codes WHERE document=?")) {
+            preparedStatement.setLong(1, document.getId());
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.next()) {
+                return new InviteCode(resultSet.getString(1), document.getId());
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+        //invite code does not already exist, so a new one must be made
+        InviteCode inviteCode = new InviteCode(document);
+        try (PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO invite_codes(code, document) VALUES (?, ?)")) {
+            preparedStatement.setString(1, inviteCode.getCode());
+            preparedStatement.setLong(2, inviteCode.getDocument());
+            preparedStatement.execute();
+            return inviteCode;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    public void addUserSession(PersistentUserSession persistentUserSession) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO persistent_user_sessions(id, \"user\", creation_time, hashed_token) VALUES (?, ?, ?, ?)")) {
+            preparedStatement.setLong(1, persistentUserSession.getId());
+            preparedStatement.setLong(2, persistentUserSession.getUser());
+            preparedStatement.setTimestamp(3, persistentUserSession.getCreation());
+            preparedStatement.setBinaryStream(4, new ByteArrayInputStream(persistentUserSession.getHashedToken()));
+            preparedStatement.execute();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Remove a user session for a token and return the removed user session
+     */
+    @Override
+    public PersistentUserSession removeUserSession(long id) {//todo combine
+        PersistentUserSession persistentUserSession;
+
+        try (PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM persistent_user_sessions WHERE id=?")) {
+            preparedStatement.setLong(1, id);
+            ResultSet resultSet = preparedStatement.executeQuery();
+            if (resultSet.next()) {
+                persistentUserSession = new PersistentUserSession(id, resultSet.getLong("user"), resultSet.getTimestamp("creation_time"), resultSet.getBinaryStream("hashed_token").readAllBytes());
+            } else {
+                BoardRoom.getLogger().warning("PersistentUserSession with id " + id + " does not exist");
+                return null;
+            }
+        } catch (SQLException | IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        try (PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM persistent_user_sessions WHERE id=?")) {
+            preparedStatement.setLong(1, id);
+            preparedStatement.execute();
+            return persistentUserSession;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/Document.java b/board-room/src/main/java/net/stzups/board/data/objects/Document.java
new file mode 100644
index 00000000..dcaeb9c2
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/Document.java
@@ -0,0 +1,63 @@
+package net.stzups.board.data.objects;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.BoardRoom;
+import net.stzups.board.data.objects.canvas.Canvas;
+
+public class Document {
+    private static final String DEFAULT_DOCUMENT_NAME = "Untitled Document";
+
+    private long id;
+    private User owner;
+    private String name;
+    private String inviteCode;
+
+    /**
+     * New document
+     */
+    public Document(User owner) {
+        this.id = BoardRoom.getRandom().nextLong();
+        this.owner = owner;
+        this.name = DEFAULT_DOCUMENT_NAME;
+    }
+
+    /**
+     * Serialize document from db
+     */
+    public Document(long id, User owner, String name) {
+        this.id = id;
+        this.owner = owner;
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public User getOwner() {
+        return owner;
+    }
+
+    @Override
+    public String toString() {
+        return "Document{id=" + id + ",name=" + name + "}";
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(id);
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        return object instanceof Document && id == ((Document) object).id;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/PersistentUserSession.java b/board-room/src/main/java/net/stzups/board/data/objects/PersistentUserSession.java
new file mode 100644
index 00000000..c99ce164
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/PersistentUserSession.java
@@ -0,0 +1,90 @@
+package net.stzups.board.data.objects;
+
+import io.netty.buffer.Unpooled;
+import net.stzups.board.BoardRoom;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.sql.Timestamp;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.TemporalAmount;
+import java.util.Arrays;
+
+public class PersistentUserSession {
+    private static final TemporalAmount MAX_USER_SESSION_AGE = Duration.ofDays(90);//todo
+    private static final SecureRandom secureRandom = new SecureRandom();
+    private static final MessageDigest messageDigest;
+    static {
+        try {
+            messageDigest = MessageDigest.getInstance("SHA-256");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private long id;
+    private long user;
+    private Timestamp creation;
+    private byte[] hashedToken;
+
+    public PersistentUserSession(User user) {
+        this.id = BoardRoom.getRandom().nextLong();//todo secure random or regular random?
+        this.user = user.getId();
+        this.creation = new Timestamp(Instant.now().toEpochMilli());
+    }
+
+    public PersistentUserSession(long id, long user, Timestamp creation, byte[] hashedToken) {
+        this.id = id;
+        this.user = user;
+        this.creation = creation;
+        this.hashedToken = hashedToken;
+    }
+
+    /** should be called once after instance creation */
+    public long generateToken() {
+        long token = secureRandom.nextLong();
+        hashedToken = messageDigest.digest(Unpooled.copyLong(token).array());
+        return token;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public long getUser() {
+        return user;
+    }
+
+    public Timestamp getCreation() {
+        return creation;
+    }
+
+    public byte[] getHashedToken() {
+        return hashedToken;
+    }
+
+    public boolean validate(long token) {
+        byte[] hashedToken = messageDigest.digest(Unpooled.copyLong(token).array());
+        boolean validate = Instant.now().isBefore(creation.toInstant().plus(MAX_USER_SESSION_AGE)) && Arrays.equals(this.hashedToken, hashedToken);
+        //this session will have already been deleted in db and should be garbage collected right after this, but just in case zero the hashes so it won't work again
+        Arrays.fill(this.hashedToken, (byte) 0);
+        return validate;
+    }
+
+    @Override
+    public String toString() {
+        return "UserSession{id=" + id + ",user" + user + ",creationTime=" + creation + "}";
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(id);
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        return object instanceof PersistentUserSession && id == ((PersistentUserSession) object).id;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/User.java b/board-room/src/main/java/net/stzups/board/data/objects/User.java
new file mode 100644
index 00000000..f99f990d
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/User.java
@@ -0,0 +1,58 @@
+package net.stzups.board.data.objects;
+
+import java.util.Arrays;
+
+public class User {
+    private long id;
+    private Long[] ownedDocuments;
+    private Long[] sharedDocuments;
+
+    public User(long id, Long[] ownedDocuments, Long[] sharedDocuments) {
+        this.id = id;
+        this.ownedDocuments = ownedDocuments;
+        this.sharedDocuments = sharedDocuments;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public Long[] getOwnedDocuments() {
+        return ownedDocuments;
+    }
+
+    public void addOwnedDocument(Document document) {
+        ownedDocuments = addElement(ownedDocuments, document);
+    }
+
+    public Long[] getSharedDocuments() {
+        return sharedDocuments;
+    }
+
+    public void addSharedDocument(Document document) {
+        sharedDocuments = addElement(sharedDocuments, document);
+    }
+
+    private Long[] addElement(Long[] oldLongs, Document element) {
+        Long[] newLongs = new Long[oldLongs.length + 1];
+        System.arraycopy(oldLongs, 0, newLongs, 0, oldLongs.length);
+        newLongs[newLongs.length - 1] = element.getId();
+        return newLongs;
+    }
+
+    @Override
+    public String toString() {
+        return "User{id=" + id + ",ownedDocuments=" + Arrays.toString(ownedDocuments) + ",sharedDocuments=" + Arrays.toString(sharedDocuments) + "}";
+    }
+
+    @Override
+    public int hashCode() {
+        return Long.hashCode(id);
+    }
+
+
+    @Override
+    public boolean equals(Object object) {
+        return object instanceof User && id == ((User) object).id;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/canvas/Canvas.java b/board-room/src/main/java/net/stzups/board/data/objects/canvas/Canvas.java
new file mode 100644
index 00000000..24a512ab
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/canvas/Canvas.java
@@ -0,0 +1,81 @@
+package net.stzups.board.data.objects.canvas;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.BoardRoom;
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.data.objects.canvas.object.CanvasObject;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectType;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectWrapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Canvas {
+    private Map<CanvasObjectType, Map<Short, CanvasObject>> canvasObjects = new HashMap<>();
+
+    private Document document;
+
+    public Canvas(Document document) {
+        this.document = document;
+    }
+
+    /**
+     * Deserializes canvas from db
+     */
+    public Canvas(Document document, ByteBuf byteBuf) {
+        this.document = document;
+        int length = byteBuf.readUnsignedByte();
+        for (int i = 0; i < length; i++) {
+            CanvasObjectType canvasObjectType = CanvasObjectType.valueOf(byteBuf.readUnsignedByte());
+            Map<Short, CanvasObject> map = new HashMap<>();
+            canvasObjects.put(canvasObjectType, map);
+            int l = byteBuf.readUnsignedShort();
+            for (int j = 0; j < l; j++) {
+                map.put(byteBuf.readShort(), CanvasObject.getCanvasObject(canvasObjectType, byteBuf));
+            }
+        }
+    }
+
+    public Document getDocument() {
+        return document;
+    }
+
+    public void update(Map<CanvasObjectType, Map<Short, CanvasObjectWrapper>> updateCanvasObjects) {
+        for (Map.Entry<CanvasObjectType, Map<Short, CanvasObjectWrapper>> entry : updateCanvasObjects.entrySet()) {
+            Map<Short, CanvasObject> map = canvasObjects.computeIfAbsent(entry.getKey(), k -> new HashMap<>());
+            for (Map.Entry<Short, CanvasObjectWrapper> entry1 : entry.getValue().entrySet()) {
+                map.put(entry1.getKey(), entry1.getValue().getCanvasObject());
+            }
+        }
+    }
+
+    public void delete(Map<CanvasObjectType, Map<Short, CanvasObject>> deleteCanvasObjects) {
+        for (Map.Entry<CanvasObjectType, Map<Short, CanvasObject>> entry : deleteCanvasObjects.entrySet()) {
+            Map<Short, CanvasObject> map = canvasObjects.get(entry.getKey());
+            if (map == null) {
+                BoardRoom.getLogger().warning("Tried to delete canvas object that does not exist");
+            } else {
+                for (Map.Entry<Short, CanvasObject> entry1 : entry.getValue().entrySet()) {
+                    map.remove(entry1.getKey());
+                }
+            }
+        }
+    }
+
+    public void serialize(ByteBuf byteBuf) {
+        byteBuf.writeByte((byte) canvasObjects.size());
+        for (Map.Entry<CanvasObjectType, Map<Short, CanvasObject>> entry : canvasObjects.entrySet()) {
+            byteBuf.writeByte((byte) entry.getKey().getId());
+            byteBuf.writeShort((short) entry.getValue().size());
+            for (Map.Entry<Short, CanvasObject> entry1 : entry.getValue().entrySet()) {
+                byteBuf.writeShort(entry1.getKey());
+                entry1.getValue().serialize(byteBuf);
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Canvas{document=" + document + "}";
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObject.java b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObject.java
new file mode 100644
index 00000000..8f336145
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObject.java
@@ -0,0 +1,31 @@
+package net.stzups.board.data.objects.canvas.object;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.canvas.object.objects.Shape;
+
+public class CanvasObject {
+    private short x;
+    private short y;
+
+    public CanvasObject(ByteBuf byteBuf) {
+        x = byteBuf.readShort();
+        y = byteBuf.readShort();
+    }
+
+    public void serialize(ByteBuf byteBuf) {
+        byteBuf.writeShort(x);
+        byteBuf.writeShort(y);
+    }
+
+    public static CanvasObject getCanvasObject(CanvasObjectType canvasObjectType, ByteBuf byteBuf) {
+        CanvasObject canvasObject;
+        switch (canvasObjectType) {
+            case SHAPE:
+                canvasObject = new Shape(byteBuf);
+                break;
+            default:
+                canvasObject = null;
+        }
+        return canvasObject;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObjectType.java b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObjectType.java
new file mode 100644
index 00000000..696348b8
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObjectType.java
@@ -0,0 +1,36 @@
+package net.stzups.board.data.objects.canvas.object;
+
+import io.netty.util.collection.IntObjectHashMap;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+public enum CanvasObjectType {
+    SHAPE(0),
+    ;
+
+    private static Map<Integer, CanvasObjectType> objectTypeMap = new IntObjectHashMap<>();
+    static {
+        for (CanvasObjectType canvasObjectType : EnumSet.allOf(CanvasObjectType.class)) {
+            objectTypeMap.put(canvasObjectType.id, canvasObjectType);
+        }
+    }
+
+    private int id;
+
+    CanvasObjectType(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public static CanvasObjectType valueOf(int id) {
+        CanvasObjectType objectType = objectTypeMap.get(id);
+        if (objectType == null) {
+            throw new IllegalArgumentException("Unknown CanvasObjectType for given id " + id);
+        }
+        return objectType;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObjectWrapper.java b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObjectWrapper.java
new file mode 100644
index 00000000..b006924e
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/CanvasObjectWrapper.java
@@ -0,0 +1,22 @@
+package net.stzups.board.data.objects.canvas.object;
+
+import io.netty.buffer.ByteBuf;
+
+public class CanvasObjectWrapper {
+    private byte dt;
+    private CanvasObject canvasObject;
+
+    public CanvasObjectWrapper(CanvasObjectType canvasObjectType, ByteBuf byteBuf) {
+        dt = byteBuf.readByte();
+        canvasObject = CanvasObject.getCanvasObject(canvasObjectType, byteBuf);
+    }
+
+    public CanvasObject getCanvasObject() {
+        return canvasObject;
+    }
+
+    public void serialize(ByteBuf byteBuf) {
+        byteBuf.writeByte(dt);
+        canvasObject.serialize(byteBuf);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/objects/Shape.java b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/objects/Shape.java
new file mode 100644
index 00000000..316ee956
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/data/objects/canvas/object/objects/Shape.java
@@ -0,0 +1,21 @@
+package net.stzups.board.data.objects.canvas.object.objects;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.canvas.object.CanvasObject;
+
+public class Shape extends CanvasObject {
+    private int width;
+    private int height;
+
+    public Shape(ByteBuf byteBuf) {
+        super(byteBuf);
+        width = byteBuf.readUnsignedShort();
+        height = byteBuf.readUnsignedShort();
+    }
+
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeShort((short) width);
+        byteBuf.writeShort((short) height);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/Server.java b/board-room/src/main/java/net/stzups/board/server/Server.java
new file mode 100644
index 00000000..38dcc802
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/Server.java
@@ -0,0 +1,84 @@
+package net.stzups.board.server;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslProvider;
+import net.stzups.board.BoardConfigKeys;
+import net.stzups.board.BoardRoom;
+import net.stzups.board.util.LogFactory;
+
+import javax.net.ssl.KeyManagerFactory;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+
+/**
+ * Uses netty to create an HTTP/WebSocket server on the specified port
+ */
+public class Server {
+    private static final int HTTP_PORT = 8080;
+    private static final int HTTPS_PORT = 443;
+
+    private EventLoopGroup bossGroup;
+    private EventLoopGroup workerGroup;
+
+    /**
+     * Initializes the server and binds to the specified port
+     */
+    public ChannelFuture start() throws Exception {
+        SslContext sslContext;
+        int port;
+
+        Boolean ssl = BoardRoom.getConfig().getBoolean(BoardConfigKeys.SSL);
+
+        if (!ssl) {
+            BoardRoom.getLogger().warning("Starting server using insecure http:// protocol without SSL");
+            sslContext = null;//otherwise sslEngine is null and program continues with unencrypted sockets
+            port = HTTP_PORT;
+        } else {
+            String keystorePath = BoardRoom.getConfig().getString(BoardConfigKeys.SSL_KEYSTORE_PATH);
+            String passphrase = BoardRoom.getConfig().getString(BoardConfigKeys.SSL_KEYSTORE_PASSPHRASE);
+            try (FileInputStream fileInputStream = new FileInputStream(keystorePath)) {
+                KeyStore keyStore = KeyStore.getInstance("PKCS12");
+                keyStore.load(fileInputStream, passphrase.toCharArray());
+
+                KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+                keyManagerFactory.init(keyStore, passphrase.toCharArray());
+
+                //SelfSignedCertificate selfSignedCertificate = new SelfSignedCertificate();
+                sslContext = SslContextBuilder.forServer(keyManagerFactory)
+                        .sslProvider(SslProvider.JDK)
+                        .build();
+                port = HTTPS_PORT;
+            } catch (IOException | GeneralSecurityException e) {
+                throw new Exception("Exception while getting SSL context", e);
+            }
+        }
+
+        bossGroup = new NioEventLoopGroup();
+        workerGroup = new NioEventLoopGroup();
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        serverBootstrap.group(bossGroup, workerGroup)
+                .channel(NioServerSocketChannel.class)
+                .handler(new LoggingHandler(LogFactory.getLogger("netty").getName(), LogLevel.DEBUG))
+                .childHandler(new ServerInitializer(sslContext));
+        BoardRoom.getLogger().info("Binding to port " + port);
+        return serverBootstrap.bind(port).sync().channel().closeFuture();
+    }
+
+    /**
+     * Shuts down the server gracefully, then blocks until the server is shut down
+     */
+    public void stop() {
+        bossGroup.shutdownGracefully();
+        workerGroup.shutdownGracefully();
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/server/ServerInitializer.java b/board-room/src/main/java/net/stzups/board/server/ServerInitializer.java
similarity index 68%
rename from board-server/src/main/java/net/stzups/board/server/ServerInitializer.java
rename to board-room/src/main/java/net/stzups/board/server/ServerInitializer.java
index 03d4b581..8d86715b 100644
--- a/board-server/src/main/java/net/stzups/board/server/ServerInitializer.java
+++ b/board-room/src/main/java/net/stzups/board/server/ServerInitializer.java
@@ -10,34 +10,38 @@
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
 import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler;
 import io.netty.handler.ssl.SslContext;
-import io.netty.handler.stream.ChunkedWriteHandler;
 import io.netty.handler.traffic.GlobalTrafficShapingHandler;
 import io.netty.handler.traffic.TrafficCounter;
-import net.stzups.board.Board;
-import net.stzups.board.server.websocket.protocol.PacketEncoder;
-import net.stzups.board.server.websocket.protocol.PacketDecoder;
-import net.stzups.board.server.http.HttpServerHandler;
+import io.netty.util.AttributeKey;
+import net.stzups.board.BoardConfigKeys;
+import net.stzups.board.BoardRoom;
+import net.stzups.board.util.LogFactory;
+import net.stzups.board.server.websocket.protocol.MessageDecoder;
+import net.stzups.board.server.websocket.protocol.MessageEncoder;
 
 import java.util.concurrent.Executors;
+import java.util.logging.Logger;
 
 /**
- * Creates pipeline to handle HTTP requests and WebSocket connections on the same port
+ * Creates pipeline to handle Websocket connections
  * WebSocket connections should be made to the specified WebSocket path
  * Connections not made to the WebSocket path go to ServerHandler
  */
 public class ServerInitializer extends ChannelInitializer<SocketChannel> {
+    public static final AttributeKey<Logger> LOGGER = AttributeKey.valueOf(ServerInitializer.class, "LOGGER");
+
     private static final String WEB_SOCKET_PATH = "/websocket";
-    private static final boolean DEBUG_LOG_TRAFFIC = Board.getConfig().getBoolean("debug.log.traffic", false);
 
     private GlobalTrafficShapingHandler globalTrafficShapingHandler = new GlobalTrafficShapingHandler(Executors.newSingleThreadScheduledExecutor(), 0, 0, 1000) {
         @Override
         protected void doAccounting(TrafficCounter counter) {
-            if (DEBUG_LOG_TRAFFIC) System.out.print("\rread " + (double) counter.lastReadThroughput() / 1000 * 8 + "kb/s, write "  + (double) counter.lastWriteThroughput() / 1000 * 8 + "kb/s");
+            if (BoardRoom.getConfig().getBoolean(BoardConfigKeys.DEBUG_LOG_TRAFFIC)) System.out.print("\rread " + (double) counter.lastReadThroughput() / 1000 * 8 + "kb/s, write "  + (double) counter.lastWriteThroughput() / 1000 * 8 + "kb/s");
         }
     };
 
-    private PacketEncoder packetEncoder = new PacketEncoder();
-    private PacketDecoder packetDecoder = new PacketDecoder();
+    private Logger logger;
+    private MessageEncoder messageEncoder = new MessageEncoder();
+    private MessageDecoder messageDecoder = new MessageDecoder();
     private WebSocketInitializer webSocketInitializer = new WebSocketInitializer();
     private SslContext sslContext;
 
@@ -47,13 +51,15 @@ protected void doAccounting(TrafficCounter counter) {
 
     @Override
     protected void initChannel(SocketChannel socketChannel) {
-        Board.getLogger().info("New connection from " + socketChannel.remoteAddress());
+        logger = LogFactory.getLogger(socketChannel.remoteAddress().toString());
+        socketChannel.attr(LOGGER).set(logger);
+        logger.info("Initial connection");
         ChannelPipeline pipeline = socketChannel.pipeline();
         pipeline
                 .addLast(new ChannelDuplexHandler() {
                     @Override
                     public void exceptionCaught(ChannelHandlerContext channelHandlerContext, Throwable throwable) {
-                        Board.getLogger().warning("Uncaught exception");
+                        logger.warning("Uncaught exception");
                         throwable.printStackTrace();
                     }
                 })
@@ -63,12 +69,11 @@ public void exceptionCaught(ChannelHandlerContext channelHandlerContext, Throwab
         }
         pipeline.addLast(new HttpServerCodec())
                 .addLast(new HttpObjectAggregator(65536))
-                .addLast(new ChunkedWriteHandler())
+                //.addLast(new ChunkedWriteHandler())
                 .addLast(new WebSocketServerCompressionHandler())
                 .addLast(new WebSocketServerProtocolHandler(WEB_SOCKET_PATH, null, true))
-                .addLast(new HttpServerHandler())
-                .addLast(packetEncoder)
-                .addLast(packetDecoder)
+                .addLast(messageEncoder)
+                .addLast(messageDecoder)
                 .addLast(webSocketInitializer);
     }
 }
diff --git a/board-room/src/main/java/net/stzups/board/server/WebSocketInitializer.java b/board-room/src/main/java/net/stzups/board/server/WebSocketInitializer.java
new file mode 100644
index 00000000..a51e0ca0
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/WebSocketInitializer.java
@@ -0,0 +1,19 @@
+package net.stzups.board.server;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
+import net.stzups.board.server.websocket.MessageHandler;
+
+@ChannelHandler.Sharable
+public class WebSocketInitializer extends ChannelInboundHandlerAdapter {
+
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object event) {
+        if (event instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
+            ctx.channel().attr(ServerInitializer.LOGGER).get().info("WebSocket connection initialized");
+            ctx.pipeline().addLast(new MessageHandler());//todo give this a different executor https://stackoverflow.com/questions/49133447/how-can-you-safely-perform-blocking-operations-in-a-netty-channel-handler
+        }
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/Client.java b/board-room/src/main/java/net/stzups/board/server/websocket/Client.java
similarity index 54%
rename from board-server/src/main/java/net/stzups/board/server/websocket/Client.java
rename to board-room/src/main/java/net/stzups/board/server/websocket/Client.java
index 3de8c3c6..7270cbf8 100644
--- a/board-server/src/main/java/net/stzups/board/server/websocket/Client.java
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/Client.java
@@ -1,9 +1,10 @@
 package net.stzups.board.server.websocket;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import net.stzups.board.data.TokenGenerator;
+import net.stzups.board.BoardRoom;
 import net.stzups.board.data.objects.User;
-import net.stzups.board.server.websocket.protocol.server.ServerPacket;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,7 +15,7 @@ public class Client {
     private Channel channel;
     private short id;
 
-    private List<ServerPacket> packets = new ArrayList<>();
+    private List<ServerMessage> messages = new ArrayList<>();
 
     Client(User user, Channel channel) {
         this.user = user;
@@ -31,7 +32,7 @@ public short getId() {
     }
 
     public short regenerateId() {
-        id = (short) TokenGenerator.getRandom().nextInt(); //todo is this cast less random
+        id = (short) BoardRoom.getRandom().nextInt(); //todo is this cast less random
         if (id == 0) {//indicates fake client, should not be used by real clients
             return regenerateId();
         } else {
@@ -39,18 +40,18 @@ public short regenerateId() {
         }
     }
 
-    void queuePacket(ServerPacket serverPacket) {
-        packets.add(serverPacket);
+    void queueMessage(ServerMessage serverMessage) {
+        messages.add(serverMessage);
     }
 
-    void sendPacket(ServerPacket serverPacket) {
-        channel.writeAndFlush(Collections.singletonList(serverPacket));
+    void sendMessage(ServerMessage serverMessage) {
+        channel.writeAndFlush(Collections.singletonList(serverMessage));
     }
 
-    void flushPackets() {
-        if (packets.size() > 0) {
-            channel.writeAndFlush(packets);
-            packets = new ArrayList<>();
+    void flushMessages() {
+        if (messages.size() > 0) {
+            channel.writeAndFlush(messages);
+            messages = new ArrayList<>();//clear() won't work here as the above line does not block and writes later
         }
     }
 
@@ -62,8 +63,18 @@ void disconnect() {
         }
     }
 
+    public void serialize(ByteBuf byteBuf) {
+        byteBuf.writeShort(id);
+        byteBuf.writeLong(user.getId());
+    }
+
     @Override
     public String toString() {
         return "Client{user=" + user + ",address=" + channel.remoteAddress() + "}";
     }
+
+    @Override
+    public int hashCode() {
+        return id;
+    }
 }
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/MessageHandler.java b/board-room/src/main/java/net/stzups/board/server/websocket/MessageHandler.java
new file mode 100644
index 00000000..4a148d34
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/MessageHandler.java
@@ -0,0 +1,164 @@
+package net.stzups.board.server.websocket;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import net.stzups.board.BoardRoom;
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.data.objects.PersistentUserSession;
+import net.stzups.board.data.objects.User;
+import net.stzups.board.server.ServerInitializer;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageDeleteDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageHandshake;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageOpenDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageUpdateCanvas;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageUpdateDocument;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageGetInvite;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageDeleteDocument;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageUpdateDocument;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageAddUser;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageHandshake;
+
+public class MessageHandler extends SimpleChannelInboundHandler<ClientMessage> {
+    private Room room;
+    private Client client;
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) {
+        if (room != null) {
+            room.removeClient(client);
+        }
+    }
+
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) {
+
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, ClientMessage message) {
+        switch (message.getMessageType()) {
+            case UPDATE_CANVAS: {
+                room.updateClient(client, ((ClientMessageUpdateCanvas) message).getCanvasObjects());
+                break;
+            }
+            case OPEN_DOCUMENT: {
+                ClientMessageOpenDocument clientPacketOpenDocument = (ClientMessageOpenDocument) message;
+                Document document = BoardRoom.getDatabase().getDocument(clientPacketOpenDocument.getId());
+                if (document != null) {
+                    if (room != null) {
+                        room.removeClient(client);
+                    }
+                    room = Room.getRoom(document);
+                    room.addClient(client);
+                } else {
+                    ctx.channel().attr(ServerInitializer.LOGGER).get().warning(client + " tried to open document not that does not exist");
+                }
+                break;
+            }
+            case CREATE_DOCUMENT: {
+                if (room != null) {
+                    room.removeClient(client);
+                }
+                try {
+                    room = Room.getRoom(BoardRoom.getDatabase().createDocument(client.getUser()));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                client.sendMessage(new ServerMessageUpdateDocument(room.getDocument()));
+                room.addClient(client);
+                break;
+            }
+            case HANDSHAKE: {
+                ClientMessageHandshake clientPacketHandshake = (ClientMessageHandshake) message;
+                if (client == null) {
+                    if (clientPacketHandshake.getToken() == 0) {
+                        ctx.channel().attr(ServerInitializer.LOGGER).get().info("Authenticated with blank session");
+                        client = createUserSession(ctx, null);
+                    } else {
+                        PersistentUserSession persistentUserSession = BoardRoom.getDatabase().removeUserSession(clientPacketHandshake.getId());
+                        if (persistentUserSession == null) {
+                            ctx.channel().attr(ServerInitializer.LOGGER).get().warning("Attempted to authenticate with non existent persistent user session");
+                            client = createUserSession(ctx, null);
+                        } else if (!persistentUserSession.validate(clientPacketHandshake.getToken())) {
+                            ctx.channel().attr(ServerInitializer.LOGGER).get().warning("Attempted to authenticate with invalid persistent user session " + persistentUserSession);
+                            client = createUserSession(ctx, null);
+                        } else {
+                            User user = BoardRoom.getDatabase().getUser(persistentUserSession.getUser());
+                            if (user == null) {
+                                ctx.channel().attr(ServerInitializer.LOGGER).get().severe("Somehow managed to authenticate with non existent user");
+                                client = createUserSession(ctx, null);
+                            } else {
+                                ctx.channel().attr(ServerInitializer.LOGGER).get().info(user + " authenticated with good persistent session");
+                                client = createUserSession(ctx, user);
+                            }
+                        }
+                    }
+                }
+                client.queueMessage(new ServerMessageAddUser(client.getUser()));
+                if (client.getUser().getOwnedDocuments().length == 0) {
+                    client.queueMessage(new ServerMessageUpdateDocument(BoardRoom.getDatabase().createDocument(client.getUser())));//todo
+                } else {
+                    for (long id : client.getUser().getOwnedDocuments()) {
+                        client.queueMessage(new ServerMessageUpdateDocument(BoardRoom.getDatabase().getDocument(id)));//todo aggregate
+                    }
+                }
+                client.flushMessages();
+
+                break;
+            }
+            case DELETE_DOCUMENT: {
+                ClientMessageDeleteDocument clientMessageDeleteDocument = (ClientMessageDeleteDocument) message;
+                if (clientMessageDeleteDocument.id() == room.getDocument().getId()) {
+                    System.out.println("document is delete ROOM");
+                    room.sendMessage(new ServerMessageDeleteDocument(room.getDocument()));
+                    room.end();
+                    BoardRoom.getDatabase().deleteDocument(room.getDocument());
+                    break;
+                }
+                Document document = BoardRoom.getDatabase().getDocument(clientMessageDeleteDocument.id());
+                if (document == null) {
+                    ctx.channel().attr(ServerInitializer.LOGGER).get().warning(client + " tried to delete document that does not exist");
+                    break;
+                }
+                if (!document.getOwner().equals(client.getUser())) {
+                    ctx.channel().attr(ServerInitializer.LOGGER).get().warning(client + " tried to delete document they do not own");
+                    break;
+                }
+                System.out.println("document is delete");
+                BoardRoom.getDatabase().deleteDocument(room.getDocument());
+                //Room.getRoom(document);
+                break;//todo better update logic
+            }
+            case UPDATE_DOCUMENT: {
+                ClientMessageUpdateDocument clientMessageUpdateDocument = (ClientMessageUpdateDocument) message;
+                if (clientMessageUpdateDocument.getName().length() > 64) {
+                    ctx.channel().attr(ServerInitializer.LOGGER).get().warning(client + " tried to change name to string that is too long (" + clientMessageUpdateDocument.getName().length() + ")");
+                    break;
+                }
+                room.getDocument().setName(clientMessageUpdateDocument.getName());
+                BoardRoom.getDatabase().updateDocument(room.getDocument());
+                break;//todo better update logic
+            }
+            case GET_INVITE: {
+                client.sendMessage(new ServerMessageGetInvite(BoardRoom.getDatabase().getInviteCode(room.getDocument())));
+                break;
+            }
+            default:
+                throw new UnsupportedOperationException("Unsupported message type " + message.getMessageType() + " sent by " + client);
+        }
+    }
+
+    private static Client createUserSession(ChannelHandlerContext ctx, User user) {
+        Client client;
+        if (user == null) {
+            client = new Client(BoardRoom.getDatabase().createUser(), ctx.channel());
+        } else {
+            client = new Client(user, ctx.channel());
+        }
+        PersistentUserSession persistentUserSession = new PersistentUserSession(client.getUser());//todo refactor
+        client.queueMessage(new ServerMessageHandshake(persistentUserSession));
+        BoardRoom.getDatabase().addUserSession(persistentUserSession);
+        return client;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/Room.java b/board-room/src/main/java/net/stzups/board/server/websocket/Room.java
new file mode 100644
index 00000000..4164e5e4
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/Room.java
@@ -0,0 +1,155 @@
+package net.stzups.board.server.websocket;
+
+import net.stzups.board.BoardRoom;
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.data.objects.canvas.Canvas;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectType;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectWrapper;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageAddClient;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageOpenDocument;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageRemoveClient;
+import net.stzups.board.server.websocket.protocol.server.messages.ServerMessageUpdateCanvas;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+
+class Room {
+    private static final int SEND_PERIOD = 1000;
+
+    private static Map<Document, Room> rooms = new HashMap<>();
+    static {
+        new Timer().scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                for (Room room : rooms.values()) {
+                    room.update();
+                }
+            }
+        }, 0, SEND_PERIOD);
+    }
+
+    private Set<Client> clients = new HashSet<>();
+
+    private Canvas canvas;
+
+    Room(Document document) {
+        this.canvas = BoardRoom.getDatabase().getCanvas(document);
+        rooms.put(document, this);
+        BoardRoom.getLogger().info("Started " + this);
+    }
+
+    static Room getRoom(Document document) {
+        Room room = rooms.get(document);
+        if (room == null) {
+            room = new Room(document);
+        }
+        return room;
+    }
+
+    void end() {
+        rooms.remove(canvas.getDocument());
+        BoardRoom.getDatabase().saveCanvas(canvas);//todo save interval and dirty flags
+        //todo
+        BoardRoom.getLogger().info("Ended room " + this);
+    }
+
+    Document getDocument() {
+        return canvas.getDocument();
+    }
+
+    void updateClient(Client client, Map<CanvasObjectType, Map<Short, CanvasObjectWrapper>> canvasObjects) {
+        canvas.update(canvasObjects);
+        ServerMessageUpdateCanvas serverMessageUpdateCanvas = new ServerMessageUpdateCanvas(canvasObjects);
+        queueMessageExcept(serverMessageUpdateCanvas, client);
+    }
+
+    /**
+     * Creates a new client using its channel.
+     * todo
+     */
+    void addClient(Client client) {
+
+        //for the new client
+        //client.sendMessage(new ServerMessageOpenDocument(document));todo remove
+        //for the existing clients
+        client.queueMessage(new ServerMessageOpenDocument(canvas));
+        queueMessage(new ServerMessageAddClient(client));
+        client.queueMessage(new ServerMessageAddClient(clients));//todo
+        clients.add(client);
+        flushMessages();
+        BoardRoom.getLogger().info("Added " + client + " to " + this);
+    }
+
+    /**
+     * Removes given client from room
+     *
+     * @param client client to remove
+     */
+    void removeClient(Client client) {
+        clients.remove(client);
+        sendMessage(new ServerMessageRemoveClient(client));
+        BoardRoom.getLogger().info("Removed " + client + " to " + this);
+        if (clients.isEmpty()) {
+            end();
+        }
+    }
+
+    /**
+     * Send given message to all members of the room except for the specified client
+     *
+     * @param serverMessage message to send
+     * @param except client to exclude
+     */
+    void sendPacketExcept(ServerMessage serverMessage, Client except) {
+        for (Client client : clients) {
+            if (except != client) {
+                client.sendMessage(serverMessage);
+            }
+        }
+    }
+
+    /**
+     * Send given message to all clients of this room
+     *
+     * @param serverMessage the message to send
+     */
+    void sendMessage(ServerMessage serverMessage) {
+        for (Client client : clients) {
+            client.sendMessage(serverMessage);
+        }
+    }
+
+    void queueMessageExcept(ServerMessage serverMessage, Client except) {
+        for (Client client : clients) {
+            if (except != client) {
+                client.queueMessage(serverMessage);
+            }
+        }
+    }
+
+    void queueMessage(ServerMessage serverMessage) {
+        for (Client client : clients) {
+            client.queueMessage(serverMessage);
+        }
+    }
+
+    void flushMessages() {
+        for (Client client : clients) {
+            client.flushMessages();
+        }
+    }
+
+    private void update() {
+        flushMessages();
+    }
+
+    @Override
+    public String toString() {
+        return "Room{canvas=" + canvas + "}";
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/MessageDecoder.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/MessageDecoder.java
new file mode 100644
index 00000000..fcce8a56
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/MessageDecoder.java
@@ -0,0 +1,42 @@
+package net.stzups.board.server.websocket.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import net.stzups.board.server.ServerInitializer;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageCreateDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageDeleteDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageHandshake;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageOpenDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageUpdateCanvas;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageUpdateDocument;
+
+import javax.naming.OperationNotSupportedException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+/**
+ * Decodes a WebSocketFrame sent by the client to a ClientPacket
+ */
+@ChannelHandler.Sharable
+public class MessageDecoder extends MessageToMessageDecoder<WebSocketFrame> {
+    @Override
+    protected void decode(ChannelHandlerContext ctx, WebSocketFrame webSocketFrame, List<Object> list) throws Exception {
+        if (webSocketFrame instanceof TextWebSocketFrame) {
+            ctx.channel().attr(ServerInitializer.LOGGER).get().warning("Got TextWebSocketFrame, content:");
+            ctx.channel().attr(ServerInitializer.LOGGER).get().warning(((TextWebSocketFrame) webSocketFrame).text());
+        } else if (webSocketFrame instanceof BinaryWebSocketFrame) {
+            ByteBuf byteBuf = webSocketFrame.content();
+            ClientMessageType clientMessageType = ClientMessageType.valueOf(byteBuf.readUnsignedByte());
+            ClientMessage clientMessage = ClientMessage.getClientMessage(clientMessageType, byteBuf);
+            ctx.channel().attr(ServerInitializer.LOGGER).get().info("recv " + clientMessage.getClass().getSimpleName());
+            list.add(clientMessage);
+        }
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/PacketEncoder.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/MessageEncoder.java
similarity index 53%
rename from board-server/src/main/java/net/stzups/board/server/websocket/protocol/PacketEncoder.java
rename to board-room/src/main/java/net/stzups/board/server/websocket/protocol/MessageEncoder.java
index e46d51db..b1719c4c 100644
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/PacketEncoder.java
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/MessageEncoder.java
@@ -5,7 +5,8 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import net.stzups.board.server.websocket.protocol.server.ServerPacket;
+import net.stzups.board.server.ServerInitializer;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
 
 import java.util.List;
 
@@ -13,15 +14,17 @@
  * Encodes a ServerPacket sent by the server to
  */
 @ChannelHandler.Sharable
-public class PacketEncoder extends MessageToByteEncoder<List<ServerPacket>> {
+public class MessageEncoder extends MessageToByteEncoder<List<ServerMessage>> {
     @Override
-    protected void encode(ChannelHandlerContext ctx, List<ServerPacket> serverPackets, ByteBuf b) {
+    protected void encode(ChannelHandlerContext ctx, List<ServerMessage> serverMessages, ByteBuf b) {
+        StringBuilder stringBuilder = new StringBuilder();
         BinaryWebSocketFrame binaryWebSocketFrame = new BinaryWebSocketFrame();
         ByteBuf byteBuf = binaryWebSocketFrame.content();
-        for (ServerPacket serverPacket : serverPackets) {
-            System.out.println("send " + serverPacket.getClass().getSimpleName());
-            serverPacket.serialize(byteBuf);
+        for (ServerMessage serverMessage : serverMessages) {
+            stringBuilder.append(serverMessage.getClass().getSimpleName()).append(", ");
+            serverMessage.serialize(byteBuf);
         }
+        ctx.channel().attr(ServerInitializer.LOGGER).get().info("send " + stringBuilder.toString());
         ctx.writeAndFlush(binaryWebSocketFrame);
     }
 }
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientMessage.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientMessage.java
new file mode 100644
index 00000000..19f5d6b5
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientMessage.java
@@ -0,0 +1,63 @@
+package net.stzups.board.server.websocket.protocol.client;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageCreateDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageGetInvite;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageDeleteDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageHandshake;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageOpenDocument;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageUpdateCanvas;
+import net.stzups.board.server.websocket.protocol.client.messages.ClientMessageUpdateDocument;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Represents a packet sent by the client
+ */
+public abstract class ClientMessage {
+    private ClientMessageType packetType;
+
+    protected ClientMessage(ClientMessageType packetType) {
+        this.packetType = packetType;
+    }
+
+    public ClientMessageType getMessageType() {
+        return packetType;
+    }
+
+    protected String readString(ByteBuf byteBuf) {
+        byte[] buffer = new byte[byteBuf.readUnsignedByte()];
+        byteBuf.readBytes(buffer);
+        return new String(buffer, StandardCharsets.UTF_8);
+    }
+
+    public static ClientMessage getClientMessage(ClientMessageType clientMessageType, ByteBuf byteBuf) {
+        ClientMessage message;
+        switch (clientMessageType) {
+            case OPEN_DOCUMENT:
+                message = new ClientMessageOpenDocument(byteBuf);
+                break;
+            case UPDATE_CANVAS:
+                message = new ClientMessageUpdateCanvas(byteBuf);
+                break;
+            case CREATE_DOCUMENT:
+                message = new ClientMessageCreateDocument(byteBuf);
+                break;
+            case HANDSHAKE:
+                message = new ClientMessageHandshake(byteBuf);
+                break;
+            case DELETE_DOCUMENT:
+                message = new ClientMessageDeleteDocument(byteBuf);
+                break;
+            case UPDATE_DOCUMENT:
+                message = new ClientMessageUpdateDocument(byteBuf);
+                break;
+            case GET_INVITE:
+                message = new ClientMessageGetInvite(byteBuf);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported message type " + clientMessageType + " while decoding");
+        }
+        return message;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientMessageType.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientMessageType.java
new file mode 100644
index 00000000..26f3f14c
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientMessageType.java
@@ -0,0 +1,42 @@
+package net.stzups.board.server.websocket.protocol.client;
+
+import io.netty.util.collection.IntObjectHashMap;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+public enum ClientMessageType {
+    OPEN_DOCUMENT(0),
+    UPDATE_CANVAS(1),
+    CREATE_DOCUMENT(2),
+    HANDSHAKE(3),
+    DELETE_DOCUMENT(4),
+    UPDATE_DOCUMENT(5),
+    GET_INVITE(6)
+    ;
+
+    private static Map<Integer, ClientMessageType> messageTypeMap = new IntObjectHashMap<>();
+    static {
+        for (ClientMessageType messageType : EnumSet.allOf(ClientMessageType.class)) {
+            messageTypeMap.put(messageType.id, messageType);
+        }
+    }
+
+    private int id;
+
+    ClientMessageType(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public static ClientMessageType valueOf(int id) {
+        ClientMessageType messageType = messageTypeMap.get(id);
+        if (messageType == null) {
+            throw new IllegalArgumentException("Unknown PacketType for given id " + id);
+        }
+        return messageType;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageCreateDocument.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageCreateDocument.java
new file mode 100644
index 00000000..64950f99
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageCreateDocument.java
@@ -0,0 +1,11 @@
+package net.stzups.board.server.websocket.protocol.client.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+
+public class ClientMessageCreateDocument extends ClientMessage {
+    public ClientMessageCreateDocument(ByteBuf byteBuf) {
+        super(ClientMessageType.CREATE_DOCUMENT);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageDeleteDocument.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageDeleteDocument.java
new file mode 100644
index 00000000..1d5fb23d
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageDeleteDocument.java
@@ -0,0 +1,18 @@
+package net.stzups.board.server.websocket.protocol.client.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+
+public class ClientMessageDeleteDocument extends ClientMessage {
+    private long id;
+
+    public ClientMessageDeleteDocument(ByteBuf byteBuf) {
+        super(ClientMessageType.DELETE_DOCUMENT);
+        this.id = byteBuf.readLong();
+    }
+
+    public long id() {
+        return id;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageGetInvite.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageGetInvite.java
new file mode 100644
index 00000000..922a1c2f
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageGetInvite.java
@@ -0,0 +1,11 @@
+package net.stzups.board.server.websocket.protocol.client.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+
+public class ClientMessageGetInvite extends ClientMessage {
+    public ClientMessageGetInvite(ByteBuf byteBuf) {
+        super(ClientMessageType.GET_INVITE);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageHandshake.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageHandshake.java
new file mode 100644
index 00000000..09532ca7
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageHandshake.java
@@ -0,0 +1,24 @@
+package net.stzups.board.server.websocket.protocol.client.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+
+public class ClientMessageHandshake extends ClientMessage {
+    private long id;
+    private long token;
+
+    public ClientMessageHandshake(ByteBuf byteBuf) {
+        super(ClientMessageType.HANDSHAKE);
+        this.id = byteBuf.readLong();
+        this.token = byteBuf.readLong();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public long getToken() {
+        return token;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageOpenDocument.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageOpenDocument.java
new file mode 100644
index 00000000..026a4907
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageOpenDocument.java
@@ -0,0 +1,18 @@
+package net.stzups.board.server.websocket.protocol.client.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+
+public class ClientMessageOpenDocument extends ClientMessage {
+    private long id;
+
+    public ClientMessageOpenDocument(ByteBuf byteBuf) {
+        super(ClientMessageType.OPEN_DOCUMENT);
+        this.id = byteBuf.readLong();
+    }
+
+    public long getId() {
+        return id;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageUpdateCanvas.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageUpdateCanvas.java
new file mode 100644
index 00000000..b6db09d9
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageUpdateCanvas.java
@@ -0,0 +1,32 @@
+package net.stzups.board.server.websocket.protocol.client.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectType;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectWrapper;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClientMessageUpdateCanvas extends ClientMessage {
+    private Map<CanvasObjectType, Map<Short, CanvasObjectWrapper>> canvas = new HashMap<>();
+
+    public ClientMessageUpdateCanvas(ByteBuf byteBuf) {
+        super(ClientMessageType.UPDATE_CANVAS);
+        int length = byteBuf.readUnsignedByte();
+        for (int i = 0; i < length; i++) {
+            CanvasObjectType canvasObjectType = CanvasObjectType.valueOf(byteBuf.readUnsignedByte());
+            Map<Short, CanvasObjectWrapper> map = new HashMap<>();
+            int lengthJ = byteBuf.readUnsignedShort();
+            for (int j = 0; j < lengthJ; j++) {
+                map.put(byteBuf.readShort(), new CanvasObjectWrapper(canvasObjectType, byteBuf));
+            }
+            canvas.put(canvasObjectType, map);
+        }
+    }
+
+    public Map<CanvasObjectType, Map<Short, CanvasObjectWrapper>> getCanvasObjects() {
+        return canvas;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageUpdateDocument.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageUpdateDocument.java
new file mode 100644
index 00000000..d8821aa2
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/client/messages/ClientMessageUpdateDocument.java
@@ -0,0 +1,24 @@
+package net.stzups.board.server.websocket.protocol.client.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.protocol.client.ClientMessage;
+import net.stzups.board.server.websocket.protocol.client.ClientMessageType;
+
+public class ClientMessageUpdateDocument extends ClientMessage {
+    private long id;
+    private String name;
+
+    public ClientMessageUpdateDocument(ByteBuf byteBuf) {
+        super(ClientMessageType.UPDATE_DOCUMENT);
+        id = byteBuf.readLong();
+        name = readString(byteBuf);
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacket.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerMessage.java
similarity index 78%
rename from board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacket.java
rename to board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerMessage.java
index 44978feb..9fec2d32 100644
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacket.java
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerMessage.java
@@ -7,10 +7,10 @@
 /**
  * Represents a packet sent by the server
  */
-public abstract class ServerPacket {
-    private ServerPacketType packetType;
+public abstract class ServerMessage {
+    private ServerMessageType packetType;
 
-    ServerPacket(ServerPacketType packetType) {
+    protected ServerMessage(ServerMessageType packetType) {
         this.packetType = packetType;
     }
 
@@ -20,7 +20,7 @@ public void serialize(ByteBuf bytebuf) {
     }
 
     /** poorly encodes strings as utf 8 preceded by a one byte unsigned length */
-    static void writeString(String string, ByteBuf byteBuf) {
+    protected static void writeString(String string, ByteBuf byteBuf) {
         if (string.length() > 0xff) {
             throw new UnsupportedOperationException("String too long");
         }
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerMessageType.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerMessageType.java
new file mode 100644
index 00000000..19f32d96
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerMessageType.java
@@ -0,0 +1,44 @@
+package net.stzups.board.server.websocket.protocol.server;
+
+import io.netty.util.collection.IntObjectHashMap;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+public enum ServerMessageType {
+    ADD_CLIENT(0),
+    REMOVE_CLIENT(1),
+    UPDATE_CANVAS(2),
+    OPEN_DOCUMENT(3),
+    UPDATE_DOCUMENT(4),
+    HANDSHAKE(5),
+    ADD_USER(6),
+    DELETE_DOCUMENT(7),
+    GET_INVITE(8)
+    ;
+
+    private static Map<Integer, ServerMessageType> messageTypeMap = new IntObjectHashMap<>();
+    static {
+        for (ServerMessageType packetType : EnumSet.allOf(ServerMessageType.class)) {
+            messageTypeMap.put(packetType.id, packetType);
+        }
+    }
+
+    private int id;
+
+    ServerMessageType(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public static ServerMessageType valueOf(int id) {
+        ServerMessageType messageType = messageTypeMap.get(id);
+        if (messageType == null) {
+            throw new IllegalArgumentException("Unknown PacketTypeServer for given id " + id);
+        }
+        return messageType;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageAddClient.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageAddClient.java
new file mode 100644
index 00000000..45027a2f
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageAddClient.java
@@ -0,0 +1,31 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.Client;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class ServerMessageAddClient extends ServerMessage {
+    private Set<Client> clients;
+
+    public ServerMessageAddClient(Client client) {
+        this(Collections.singleton(client));
+    }
+
+    public ServerMessageAddClient(Set<Client> clients) {
+        super(ServerMessageType.ADD_CLIENT);
+        this.clients = clients;
+    }
+
+    @Override
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeShort((short) clients.size());
+        for (Client client : clients) {
+            client.serialize(byteBuf);
+        }
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageAddUser.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageAddUser.java
new file mode 100644
index 00000000..5c3a38ec
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageAddUser.java
@@ -0,0 +1,21 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.User;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+public class ServerMessageAddUser extends ServerMessage {
+    private User user;
+
+    public ServerMessageAddUser(User user) {
+        super(ServerMessageType.ADD_USER);
+        this.user = user;
+    }
+
+    @Override
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeLong(user.getId());
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageDeleteDocument.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageDeleteDocument.java
new file mode 100644
index 00000000..7415ea6d
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageDeleteDocument.java
@@ -0,0 +1,21 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+public class ServerMessageDeleteDocument extends ServerMessage {
+    private long id;
+
+    public ServerMessageDeleteDocument(Document document) {
+        super(ServerMessageType.DELETE_DOCUMENT);
+        id = document.getId();
+    }
+
+    @Override
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeLong(id);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageGetInvite.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageGetInvite.java
new file mode 100644
index 00000000..af0fac01
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageGetInvite.java
@@ -0,0 +1,21 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.InviteCode;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+public class ServerMessageGetInvite extends ServerMessage {
+    private String code;
+
+    public ServerMessageGetInvite(InviteCode inviteCode) {
+        super(ServerMessageType.GET_INVITE);
+        code = inviteCode.getCode();
+    }
+
+    @Override
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        writeString(code, byteBuf);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageHandshake.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageHandshake.java
new file mode 100644
index 00000000..8d4da239
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageHandshake.java
@@ -0,0 +1,24 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.PersistentUserSession;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+public class ServerMessageHandshake extends ServerMessage {
+    private long id;
+    private long token;
+
+    public ServerMessageHandshake(PersistentUserSession persistentUserSession) {
+        super(ServerMessageType.HANDSHAKE);
+        this.id = persistentUserSession.getId();
+        this.token = persistentUserSession.generateToken();
+    }
+
+    @Override
+    public void serialize(ByteBuf bytebuf) {
+        super.serialize(bytebuf);
+        bytebuf.writeLong(id);
+        bytebuf.writeLong(token);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageOpenDocument.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageOpenDocument.java
new file mode 100644
index 00000000..f8a56907
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageOpenDocument.java
@@ -0,0 +1,22 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.canvas.Canvas;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+public class ServerMessageOpenDocument extends ServerMessage {
+    private Canvas canvas;
+
+    public ServerMessageOpenDocument(Canvas canvas) {
+        super(ServerMessageType.OPEN_DOCUMENT);
+        this.canvas = canvas;
+    }
+
+    @Override
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeLong(this.canvas.getDocument().getId());
+        this.canvas.serialize(byteBuf);
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageRemoveClient.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageRemoveClient.java
new file mode 100644
index 00000000..d1555b73
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageRemoveClient.java
@@ -0,0 +1,21 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.server.websocket.Client;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+public class ServerMessageRemoveClient extends ServerMessage {
+    Client client;
+
+    public ServerMessageRemoveClient(Client client) {
+        super(ServerMessageType.REMOVE_CLIENT);
+        this.client = client;
+    }
+
+    @Override
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeShort(client.getId());
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageUpdateCanvas.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageUpdateCanvas.java
new file mode 100644
index 00000000..ec1e5ab6
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageUpdateCanvas.java
@@ -0,0 +1,31 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectType;
+import net.stzups.board.data.objects.canvas.object.CanvasObjectWrapper;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+import java.util.Map;
+
+public class ServerMessageUpdateCanvas extends ServerMessage {
+    private Map<CanvasObjectType, Map<Short, CanvasObjectWrapper>> canvasObjects;
+
+    public ServerMessageUpdateCanvas(Map<CanvasObjectType, Map<Short, CanvasObjectWrapper>> canvasObjects) {
+        super(ServerMessageType.UPDATE_CANVAS);
+        this.canvasObjects = canvasObjects;
+    }
+
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeByte((byte) canvasObjects.size());
+        for (Map.Entry<CanvasObjectType, Map<Short, CanvasObjectWrapper>> entry : canvasObjects.entrySet()) {
+            byteBuf.writeByte((byte) entry.getKey().getId());
+            byteBuf.writeShort((short) entry.getValue().size());
+            for (Map.Entry<Short, CanvasObjectWrapper> entry1 : entry.getValue().entrySet()) {
+                byteBuf.writeShort(entry1.getKey());
+                entry1.getValue().serialize(byteBuf);
+            }
+        }
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageUpdateDocument.java b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageUpdateDocument.java
new file mode 100644
index 00000000..b84693a5
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/server/websocket/protocol/server/messages/ServerMessageUpdateDocument.java
@@ -0,0 +1,22 @@
+package net.stzups.board.server.websocket.protocol.server.messages;
+
+import io.netty.buffer.ByteBuf;
+import net.stzups.board.data.objects.Document;
+import net.stzups.board.server.websocket.protocol.server.ServerMessage;
+import net.stzups.board.server.websocket.protocol.server.ServerMessageType;
+
+public class ServerMessageUpdateDocument extends ServerMessage {
+    private Document document;
+
+    public ServerMessageUpdateDocument(Document document) {
+        super(ServerMessageType.UPDATE_DOCUMENT);
+        this.document = document;
+    }
+
+    @Override
+    public void serialize(ByteBuf byteBuf) {
+        super.serialize(byteBuf);
+        byteBuf.writeLong(document.getId());
+        writeString(document.getName(), byteBuf);
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/LogFactory.java b/board-room/src/main/java/net/stzups/board/util/LogFactory.java
similarity index 97%
rename from board-server/src/main/java/net/stzups/board/LogFactory.java
rename to board-room/src/main/java/net/stzups/board/util/LogFactory.java
index 7923a74f..72c75d13 100644
--- a/board-server/src/main/java/net/stzups/board/LogFactory.java
+++ b/board-room/src/main/java/net/stzups/board/util/LogFactory.java
@@ -1,4 +1,4 @@
-package net.stzups.board;
+package net.stzups.board.util;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
diff --git a/board-server/src/main/java/net/stzups/board/RandomString.java b/board-room/src/main/java/net/stzups/board/util/RandomString.java
similarity index 94%
rename from board-server/src/main/java/net/stzups/board/RandomString.java
rename to board-room/src/main/java/net/stzups/board/util/RandomString.java
index d5571aea..a47b73f0 100644
--- a/board-server/src/main/java/net/stzups/board/RandomString.java
+++ b/board-room/src/main/java/net/stzups/board/util/RandomString.java
@@ -1,4 +1,4 @@
-package net.stzups.board;
+package net.stzups.board.util;
 
 import java.util.Random;
 
diff --git a/board-room/src/main/java/net/stzups/board/util/config/Config.java b/board-room/src/main/java/net/stzups/board/util/config/Config.java
new file mode 100644
index 00000000..f35d661c
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/util/config/Config.java
@@ -0,0 +1,65 @@
+package net.stzups.board.util.config;
+
+import java.util.List;
+
+/**
+ * Used to store and retrieve key-value pairs by finding the first result from many different strategies.
+ */
+public class Config {//todo probably needs a better name
+    private List<ConfigProvider> configProviders;
+
+    /**
+     * Constructs a new ConfigProvider from its builder
+     */
+    Config(List<ConfigProvider> configProviders) {
+        this.configProviders = configProviders;
+    }
+
+    /**
+     * Gets a String value for a String key from any config provider
+     */
+    private String find(ConfigKey<?> key) {
+        for (ConfigProvider configProvider : configProviders) {
+            String value = configProvider.get(key.getKey());
+            if (value != null) {
+                return value;
+            }
+        }
+
+        return null;
+    }
+
+    public String getString(ConfigKey<String> key) {
+        String value = find(key);
+        if (value != null) {
+            return value;
+        }
+        return key.getDefaultValue(null);
+    }
+
+    public int getInt(ConfigKey<Integer> key) {
+        String value = find(key);
+        if (value != null) {
+            try {
+                return Integer.parseInt(value);
+            } catch (NumberFormatException e) {
+                return key.getDefaultValue(e);
+            }
+        }
+        return key.getDefaultValue(null);
+    }
+
+    public Boolean getBoolean(ConfigKey<Boolean> key) {
+        String value = find(key);
+        if (value != null) {
+            if (value.equalsIgnoreCase("true")) {
+                return true;
+            } else if (value.equalsIgnoreCase("false")) {
+                return false;
+            } else {
+                return key.getDefaultValue(new IllegalArgumentException(value + " is not true or false"));
+            }
+        }
+        return key.getDefaultValue(null);
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/config/ConfigBuilder.java b/board-room/src/main/java/net/stzups/board/util/config/ConfigBuilder.java
similarity index 92%
rename from board-server/src/main/java/net/stzups/board/config/ConfigBuilder.java
rename to board-room/src/main/java/net/stzups/board/util/config/ConfigBuilder.java
index 884384e4..484b408a 100644
--- a/board-server/src/main/java/net/stzups/board/config/ConfigBuilder.java
+++ b/board-room/src/main/java/net/stzups/board/util/config/ConfigBuilder.java
@@ -1,4 +1,4 @@
-package net.stzups.board.config;
+package net.stzups.board.util.config;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/board-room/src/main/java/net/stzups/board/util/config/ConfigKey.java b/board-room/src/main/java/net/stzups/board/util/config/ConfigKey.java
new file mode 100644
index 00000000..1a59b9fe
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/util/config/ConfigKey.java
@@ -0,0 +1,17 @@
+package net.stzups.board.util.config;
+
+public class ConfigKey<T> {
+    private String key;
+
+    ConfigKey(String key) {
+        this.key = key;
+    }
+
+    String getKey() {
+        return key;
+    }
+
+    T getDefaultValue(Exception e) {
+        throw new UnsupportedOperationException("Method should be overridden");
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/config/ConfigProvider.java b/board-room/src/main/java/net/stzups/board/util/config/ConfigProvider.java
similarity index 63%
rename from board-server/src/main/java/net/stzups/board/config/ConfigProvider.java
rename to board-room/src/main/java/net/stzups/board/util/config/ConfigProvider.java
index b892a205..464f50a9 100644
--- a/board-server/src/main/java/net/stzups/board/config/ConfigProvider.java
+++ b/board-room/src/main/java/net/stzups/board/util/config/ConfigProvider.java
@@ -1,4 +1,4 @@
-package net.stzups.board.config;
+package net.stzups.board.util.config;
 
 public interface ConfigProvider {
     String get(String key);
diff --git a/board-room/src/main/java/net/stzups/board/util/config/OptionalConfigKey.java b/board-room/src/main/java/net/stzups/board/util/config/OptionalConfigKey.java
new file mode 100644
index 00000000..cf9c3a25
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/util/config/OptionalConfigKey.java
@@ -0,0 +1,17 @@
+package net.stzups.board.util.config;
+
+public class OptionalConfigKey<T> extends ConfigKey<T> {
+    private T defaultValue;
+
+    public OptionalConfigKey(String key, T defaultValue) {
+        super(key);
+        this.defaultValue = defaultValue;
+    }
+
+    T getDefaultValue(Exception e) {
+        if (e != null) {
+            new Exception("Non fatal exception while parsing value for key \"" + getKey() + "\", default value will be used", e).printStackTrace();
+        }
+        return defaultValue;
+    }
+}
diff --git a/board-room/src/main/java/net/stzups/board/util/config/RequiredConfigKey.java b/board-room/src/main/java/net/stzups/board/util/config/RequiredConfigKey.java
new file mode 100644
index 00000000..b829b0ac
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/util/config/RequiredConfigKey.java
@@ -0,0 +1,16 @@
+package net.stzups.board.util.config;
+
+public class RequiredConfigKey<T> extends ConfigKey<T> {
+    public RequiredConfigKey(String key) {
+        super(key);
+    }
+
+    @Override
+    T getDefaultValue(Exception e) {
+        if (e != null) {
+            throw new IllegalArgumentException("Parsing value for required config key \"" + getKey() + "\" caused exception", e);
+        } else {
+            throw new IllegalArgumentException("Missing value for required config key \"" + getKey() + "\"");
+        }
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/config/configs/ArgumentConfig.java b/board-room/src/main/java/net/stzups/board/util/config/configs/ArgumentConfig.java
similarity index 93%
rename from board-server/src/main/java/net/stzups/board/config/configs/ArgumentConfig.java
rename to board-room/src/main/java/net/stzups/board/util/config/configs/ArgumentConfig.java
index b7d0c911..c59dd1d8 100644
--- a/board-server/src/main/java/net/stzups/board/config/configs/ArgumentConfig.java
+++ b/board-room/src/main/java/net/stzups/board/util/config/configs/ArgumentConfig.java
@@ -1,6 +1,6 @@
-package net.stzups.board.config.configs;
+package net.stzups.board.util.config.configs;
 
-import net.stzups.board.config.ConfigProvider;
+import net.stzups.board.util.config.ConfigProvider;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/board-room/src/main/java/net/stzups/board/util/config/configs/EnvironmentVariableConfig.java b/board-room/src/main/java/net/stzups/board/util/config/configs/EnvironmentVariableConfig.java
new file mode 100644
index 00000000..db710f9a
--- /dev/null
+++ b/board-room/src/main/java/net/stzups/board/util/config/configs/EnvironmentVariableConfig.java
@@ -0,0 +1,18 @@
+package net.stzups.board.util.config.configs;
+
+import net.stzups.board.util.config.ConfigProvider;
+
+import java.util.Objects;
+
+public class EnvironmentVariableConfig implements ConfigProvider {
+    private final String prefix;
+
+    public EnvironmentVariableConfig(String prefix) {
+        this.prefix = Objects.requireNonNullElse(prefix, "");
+    }
+
+    @Override
+    public String get(String key) {
+        return System.getenv(prefix + key);
+    }
+}
diff --git a/board-server/src/main/java/net/stzups/board/config/configs/PropertiesConfig.java b/board-room/src/main/java/net/stzups/board/util/config/configs/PropertiesConfig.java
similarity index 91%
rename from board-server/src/main/java/net/stzups/board/config/configs/PropertiesConfig.java
rename to board-room/src/main/java/net/stzups/board/util/config/configs/PropertiesConfig.java
index a918299a..6482c3e1 100644
--- a/board-server/src/main/java/net/stzups/board/config/configs/PropertiesConfig.java
+++ b/board-room/src/main/java/net/stzups/board/util/config/configs/PropertiesConfig.java
@@ -1,6 +1,6 @@
-package net.stzups.board.config.configs;
+package net.stzups.board.util.config.configs;
 
-import net.stzups.board.config.ConfigProvider;
+import net.stzups.board.util.config.ConfigProvider;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/board-server/src/main/java/net/stzups/board/Board.java b/board-server/src/main/java/net/stzups/board/Board.java
deleted file mode 100644
index 6866a4c0..00000000
--- a/board-server/src/main/java/net/stzups/board/Board.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package net.stzups.board;
-
-import io.netty.channel.ChannelFuture;
-import net.stzups.board.config.Config;
-import net.stzups.board.config.ConfigBuilder;
-import net.stzups.board.config.configs.ArgumentConfig;
-import net.stzups.board.config.configs.PropertiesConfig;
-import net.stzups.board.data.TokenGenerator;
-import net.stzups.board.data.database.flatfile.FlatFileStorage;
-import net.stzups.board.data.objects.Document;
-import net.stzups.board.data.objects.HttpSession;
-import net.stzups.board.data.objects.User;
-import net.stzups.board.data.objects.UserSession;
-import net.stzups.board.server.Server;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-public class Board {
-    private static Logger logger;
-    private static Config config;
-
-    private static final String DEFAULT_DOCUMENT_NAME = "Untitled Document";
-
-    private static FlatFileStorage<Long, User> users;//user id -> user
-    private static FlatFileStorage<Long, Document> documents;//document id -> document
-    private static FlatFileStorage<Long, HttpSession> httpSessions;//http session id -> http session todo unused
-    private static FlatFileStorage<Long, UserSession> userSessions;//user session id -> user session
-
-    public static Document getDocument(long id) {
-        return documents.get(id);
-    }
-
-
-    public static void addUser(User user) {
-        users.put(user.getId(), user);
-    }
-
-    public static User getUser(long id) {
-        return users.get(id);
-    }
-
-    public static UserSession removeUserSession(long token) {
-        return userSessions.remove(token);
-    }
-
-    public static void addUserSession(UserSession userSession) {
-        userSessions.put(userSession.getToken(), userSession);
-    }
-
-    public static HttpSession getHttpSession(long token) {
-        return httpSessions.get(token);
-    }
-
-    public static void addHttpSession(HttpSession httpSession) {
-        httpSessions.put(httpSession.getToken(), httpSession);
-    }
-
-    public static Document createDocument(User owner) {
-        Document document = new Document(TokenGenerator.getSecureRandom().nextLong(), owner, DEFAULT_DOCUMENT_NAME);
-        documents.put(document.getId(), document);
-        return document;
-    }
-
-
-    public static void main(String[] args) throws Exception {
-        logger = LogFactory.getLogger("Board Server");
-
-        logger.info("Starting Board server...");
-
-        long start = System.currentTimeMillis();
-
-        config = new ConfigBuilder()
-                .addConfig(new ArgumentConfig(args))
-                .addConfig(new PropertiesConfig("board.properties"))
-                .build();
-
-        Server server = new Server();
-        ChannelFuture channelFuture = server.start();
-
-        try {
-            users = new FlatFileStorage<>("users");
-            documents = new FlatFileStorage<>("documents");
-            httpSessions = new FlatFileStorage<>("httpSessions");
-            userSessions = new FlatFileStorage<>("userSessions");
-        } catch (IOException e) {
-            e.printStackTrace();
-            return;
-        }
-
-        logger.info("Started Board server in " + (System.currentTimeMillis() - start) + "ms");
-
-        channelFuture.sync();
-
-        start = System.currentTimeMillis();
-
-        logger.info("Stopping Board Server");
-
-        server.stop();
-
-        logger.info("Stopped Board Server in " + (System.currentTimeMillis() - start) + "ms");
-    }
-
-    public static Logger getLogger() {
-        return logger;
-    }
-
-    public static Config getConfig() {
-        return config;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/config/Config.java b/board-server/src/main/java/net/stzups/board/config/Config.java
deleted file mode 100644
index db53f0b7..00000000
--- a/board-server/src/main/java/net/stzups/board/config/Config.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package net.stzups.board.config;
-
-import java.nio.ByteBuffer;
-import java.util.List;
-
-/**
- * Used to store and retrieve key-value pairs by finding the first result from many different strategies.
- */
-public class Config {//todo probably needs a better name
-    private List<ConfigProvider> configProviders;
-
-    /**
-     * Constructs a new ConfigProvider from its builder
-     */
-    Config(List<ConfigProvider> configProviders) {
-        this.configProviders = configProviders;
-    }
-
-    /**
-     * Gets a String value for a String key from any config provider
-     */
-    public String get(String key) {
-        for (ConfigProvider configProvider : configProviders) {
-            String value = configProvider.get(key);
-            if (value != null) {
-                return value;
-            }
-        }
-
-        return null;
-    }
-
-    public int getInt(String key) {
-        try {
-            return Integer.parseInt(get(key));
-        } catch (NumberFormatException e) {
-            return 0;
-        }
-    }
-
-    public int getInt(String key, int defaultValue) {
-        try {
-            return Integer.parseInt(get(key));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    public boolean getBoolean(String key) {
-        return Boolean.parseBoolean(get(key));
-    }
-
-    public boolean getBoolean(String key, boolean defaultValue) {
-        String value = get(key);
-        if (value == null) {
-            return defaultValue;
-        } else {
-            return Boolean.parseBoolean(key);
-        }
-    }
-
-    public String get(String key, String defaultValue) {
-        String value = get(key);
-        if (value == null) {
-            return defaultValue;
-        }
-        return value;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/data/TokenGenerator.java b/board-server/src/main/java/net/stzups/board/data/TokenGenerator.java
deleted file mode 100644
index 13e80e7e..00000000
--- a/board-server/src/main/java/net/stzups/board/data/TokenGenerator.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.stzups.board.data;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-public class TokenGenerator {
-
-    private static final SecureRandom secureRandom = new SecureRandom();
-    private static final Random random = new Random();
-
-    public static SecureRandom getSecureRandom() {
-        return secureRandom;
-    }
-
-    public static Random getRandom() {
-        return random;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/data/database/flatfile/FlatFileStorage.java b/board-server/src/main/java/net/stzups/board/data/database/flatfile/FlatFileStorage.java
deleted file mode 100644
index 96403055..00000000
--- a/board-server/src/main/java/net/stzups/board/data/database/flatfile/FlatFileStorage.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package net.stzups.board.data.database.flatfile;
-
-import net.stzups.board.Board;
-
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InvalidClassException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-public class FlatFileStorage<K extends Serializable, V extends Serializable> extends HashMap<K, V> {
-    private static final int SAVE_INTERVAL = Board.getConfig().getInt("autosave.interval", -1);//in seconds, -1 to disable
-    private static final String FILE_EXTENSION = "data";
-
-    private File file;
-
-    public FlatFileStorage(String name) throws IOException {
-        File directory = new File(Board.getConfig().get("data.root.path", "data"));
-        if (!directory.exists() && !directory.mkdirs()) {
-            throw new IOException("Error while making directory at " + directory.getPath());
-        }
-        file = new File(directory, name + "." + FILE_EXTENSION);
-        if (!file.exists()) {
-            if (!file.createNewFile()) {
-                throw new IOException("Error while making file at " + file.getPath());
-            }
-            save();
-        }
-        load();
-        if (SAVE_INTERVAL > 0) {
-            Executors.newSingleThreadScheduledExecutor().scheduleWithFixedDelay(() -> {
-                try {
-                    save();
-                } catch (IOException e) {
-                    Board.getLogger().warning(new IOException("Autosave: Failed to save to disk (ruh roh raggy!)", e).toString());
-                }
-            }, 10, SAVE_INTERVAL, TimeUnit.SECONDS);
-        }
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            try {
-                save();
-            } catch (IOException e) {
-                Board.getLogger().warning(new IOException("Failed to save to disk (ruh roh raggy!)", e).toString());
-            }
-        }));
-    }
-
-    protected File getFile() {
-        return file;
-    }
-
-    @SuppressWarnings("unchecked")
-    public void load() throws IOException {
-        try (ObjectInputStream objectInputStream = new ObjectInputStream(new FileInputStream(getFile()))) {
-            while (true) {
-                Object key;
-                Object value;
-                try {
-                    key = objectInputStream.readObject();
-                    value = objectInputStream.readObject();
-                } catch (ClassNotFoundException | InvalidClassException e) {
-                    e.printStackTrace();
-                    continue;//maybe just one bad entry, so keep going
-                } catch (EOFException e) {
-                    break;//indicates end of file
-                }
-                put((K) key, (V) value);//todo unchecked
-            }
-        }
-    }
-
-    public void save() throws IOException {
-        try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(getFile()))) {
-            for (Map.Entry<K, V> entry : entrySet()) {
-                objectOutputStream.writeObject(entry.getKey());
-                objectOutputStream.writeObject(entry.getValue());
-            }
-        }
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/data/objects/Document.java b/board-server/src/main/java/net/stzups/board/data/objects/Document.java
deleted file mode 100644
index dc8631a3..00000000
--- a/board-server/src/main/java/net/stzups/board/data/objects/Document.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package net.stzups.board.data.objects;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class Document implements Serializable {
-    private long id;
-    private User owner;
-    private String name;
-    private String inviteCode;
-    private Map<User, List<Point>> points = new HashMap<>();
-
-    public Document(long id, User owner, String name) {
-        this.id = id;
-        this.owner = owner;
-        owner.getOwnedDocuments().add(id);
-        this.name = name;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Map<User, List<Point>> getPoints() {
-        return points;
-    }
-
-    public void addPoints(User user, Point[] points) {
-        List<Point> pts = this.points.get(user);
-        if (pts == null) {
-            pts = new ArrayList<>();
-        }
-        pts.addAll(Arrays.asList(points));
-        this.points.put(user, pts);
-    }
-
-    @Override
-    public String toString() {
-        return "Document{id=" + id + ",name=" + name + "}";
-    }
-
-    @Override
-    public int hashCode() {
-        return Long.hashCode(id);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/data/objects/HttpSession.java b/board-server/src/main/java/net/stzups/board/data/objects/HttpSession.java
deleted file mode 100644
index 2051ad9c..00000000
--- a/board-server/src/main/java/net/stzups/board/data/objects/HttpSession.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package net.stzups.board.data.objects;
-
-import io.netty.buffer.Unpooled;
-import io.netty.handler.codec.base64.Base64;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.cookie.Cookie;
-import io.netty.handler.codec.http.cookie.DefaultCookie;
-import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
-import net.stzups.board.Board;
-import net.stzups.board.data.TokenGenerator;
-
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
-import java.util.Set;
-
-public class HttpSession implements Serializable {
-    private static final long SESSION_TOKEN_MAX_AGE = 2314;//todo
-
-    public static Cookie getCookie(HttpHeaders httpHeaders, InetAddress address) {
-        HttpSession httpSession = getSession(httpHeaders, address);
-        if (httpSession == null) {
-            return new HttpSession(address).generate();
-        }
-        return null;
-    }
-
-    public static HttpSession getSession(HttpHeaders httpHeaders, InetAddress address) {
-        String cookieString = httpHeaders.get(HttpHeaderNames.COOKIE);
-        if (cookieString != null) {
-            Set<Cookie> cookies = ServerCookieDecoder.STRICT.decode(cookieString);
-            for (Cookie cookie : cookies) {
-                if (cookie.name().equals("session-token")) {
-                    HttpSession httpSession = Board.getHttpSession(Base64.decode(Unpooled.wrappedBuffer(cookie.value().getBytes())).getLong(0));
-                    if (httpSession != null && httpSession.validate(cookie, address)) {
-                        System.out.println("good session");
-                        return httpSession;
-                    }
-                    //bad session
-                    System.out.println("bad session");
-                    break;
-                }
-            }
-        }
-        //new session
-        System.out.println("no session");
-        return null;
-    }
-
-    private long token;
-    private InetAddress address;
-
-    private HttpSession(InetAddress address) {
-        this.address = address;
-    }
-
-    private Cookie generate() {//todo make sure this is only called once
-        token = TokenGenerator.getSecureRandom().nextLong();
-        Cookie cookie = new DefaultCookie("session-token", Base64.encode(Unpooled.copyLong(token)).toString(StandardCharsets.US_ASCII));//todo allocation
-        cookie.setHttpOnly(true);
-        cookie.setDomain("localhost");//todo
-        cookie.setMaxAge(SESSION_TOKEN_MAX_AGE);
-        cookie.setPath("/");//todo
-        //cookie.setSecure(true); cant be done over http
-        cookie.setWrap(true);//todo
-        Board.addHttpSession(this);
-        return cookie;
-    }
-
-    public long getToken() {
-        return token;
-    }
-
-    private boolean validate(Cookie cookie, InetAddress address) {
-        return this.address.equals(address);
-    }
-
-    @Override
-    public String toString() {
-        return "HttpSession{address=" + address + "}";
-    }
-
-    @Override
-    public int hashCode() {
-        return Long.hashCode(token);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/data/objects/Point.java b/board-server/src/main/java/net/stzups/board/data/objects/Point.java
deleted file mode 100644
index 41c1aae3..00000000
--- a/board-server/src/main/java/net/stzups/board/data/objects/Point.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.stzups.board.data.objects;
-
-import java.io.Serializable;
-
-public class Point implements Serializable {
-    public int dt;
-    public short x;
-    public short y;
-
-    public Point(int dt, short x, short y) {
-        this.dt = dt;
-        this.x = x;
-        this.y = y;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/data/objects/User.java b/board-server/src/main/java/net/stzups/board/data/objects/User.java
deleted file mode 100644
index 724ee6d0..00000000
--- a/board-server/src/main/java/net/stzups/board/data/objects/User.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.stzups.board.data.objects;
-
-import net.stzups.board.data.TokenGenerator;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class User implements Serializable {
-    private long id;
-    private List<Long> ownedDocuments;
-    private List<Long> sharedDocuments;
-
-    public User() {
-        id = TokenGenerator.getSecureRandom().nextLong();
-        ownedDocuments = new ArrayList<>();
-        //ownedDocuments.add(Document.createDocument(this).getId()); todo do somewhere else
-        sharedDocuments = new ArrayList<>();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public List<Long> getOwnedDocuments() {
-        return ownedDocuments;
-    }
-
-    public List<Long> getSharedDocuments() {
-        return sharedDocuments;
-    }
-
-    @Override
-    public String toString() {
-        return "User{id=" + id + "}";
-    }
-
-    @Override
-    public int hashCode() {
-        return Long.hashCode(id);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/data/objects/UserSession.java b/board-server/src/main/java/net/stzups/board/data/objects/UserSession.java
deleted file mode 100644
index 27e49c69..00000000
--- a/board-server/src/main/java/net/stzups/board/data/objects/UserSession.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package net.stzups.board.data.objects;
-
-import net.stzups.board.data.TokenGenerator;
-
-import java.io.Serializable;
-import java.net.InetAddress;
-
-public class UserSession implements Serializable {
-    private static final int MAX_USER_SESSION_AGE = 10000000;//todo
-    private long userId;
-    private long token;
-    private long creationDate;
-    private InetAddress inetAddress;//todo hash?
-
-    public UserSession(User user, InetAddress inetAddress) {
-        this.userId = user.getId();
-        this.token = TokenGenerator.getSecureRandom().nextLong();
-        this.creationDate = System.currentTimeMillis();
-        this.inetAddress = inetAddress;
-    }
-
-    public long getToken() {
-        return token;
-    }
-
-    public long getUserId() {
-        return userId;
-    }
-
-    public boolean validate(InetAddress inetAddress) {
-        token = 0;
-        return (System.currentTimeMillis() - creationDate) < MAX_USER_SESSION_AGE && this.inetAddress.equals(inetAddress);
-    }
-
-    @Override
-    public String toString() {
-        return "UserSession{userId=" + userId + ",@" + hashCode()+ "}";
-    }
-
-    @Override
-    public int hashCode() {
-        return Long.hashCode(userId);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/Server.java b/board-server/src/main/java/net/stzups/board/server/Server.java
deleted file mode 100644
index 36c011dc..00000000
--- a/board-server/src/main/java/net/stzups/board/server/Server.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package net.stzups.board.server;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.logging.LogLevel;
-import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
-import net.stzups.board.Board;
-import net.stzups.board.LogFactory;
-
-import javax.net.ssl.KeyManagerFactory;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-
-/**
- * Uses netty to create an HTTP/WebSocket server on the specified port
- */
-public class Server {
-    private static final int HTTP_PORT = 80;
-    private static final int HTTPS_PORT = 443;
-
-    private EventLoopGroup bossGroup;
-    private EventLoopGroup workerGroup;
-
-    /**
-     * Initializes the server and binds to the specified port
-     */
-    public ChannelFuture start() throws Exception {
-        SslContext sslContext;
-        int port;
-
-        String keystorePath = Board.getConfig().get("ssl.keystore.path");
-        if (keystorePath != null) {//must not be null
-            if (keystorePath.equals("http")) {
-                Board.getLogger().warning("Starting server using insecure http:// protocol without SSL");
-                sslContext = null;//otherwise sslEngine is null and program continues with unencrypted sockets
-                port = HTTP_PORT;
-            } else {
-                String passphrase = Board.getConfig().get("ssl.passphrase");
-                if (passphrase != null) {//can be null if value of keystore is http
-                    try (FileInputStream fileInputStream = new FileInputStream(keystorePath)) {
-                        KeyStore keyStore = KeyStore.getInstance("PKCS12");
-                        keyStore.load(fileInputStream, passphrase.toCharArray());
-
-                        KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-                        keyManagerFactory.init(keyStore, passphrase.toCharArray());
-
-                        //SelfSignedCertificate selfSignedCertificate = new SelfSignedCertificate();
-                        sslContext = SslContextBuilder.forServer(keyManagerFactory)
-                                .sslProvider(SslProvider.JDK)
-                                .build();
-                        port = HTTPS_PORT;
-                    } catch (IOException | GeneralSecurityException e) {
-                        throw new RuntimeException("Exception while getting SSL context", e);
-                    }
-                } else {
-                    throw new RuntimeException("Failed to specify SSL passphrase from --ssl.passphrase flag.");
-                }
-            }
-        } else {
-            throw new RuntimeException("Failed to set required flag --ssl.keystore.path. Perhaps you meant to explicitly disable encrypted sockets over HTTPS using --ssl.keystore.path http");
-        }
-
-        bossGroup = new NioEventLoopGroup();
-        workerGroup = new NioEventLoopGroup();
-        ServerBootstrap serverBootstrap = new ServerBootstrap();
-        serverBootstrap.group(bossGroup, workerGroup)
-                .channel(NioServerSocketChannel.class)
-                .handler(new LoggingHandler(LogFactory.getLogger("netty").getName(), LogLevel.DEBUG))
-                .childHandler(new ServerInitializer(sslContext));
-        Board.getLogger().info("Binding to port " + port);
-        return serverBootstrap.bind(port).sync().channel().closeFuture();
-    }
-
-    /**
-     * Shuts down the server gracefully, then blocks until the server is shut down
-     */
-    public void stop() {
-        bossGroup.shutdownGracefully();
-        workerGroup.shutdownGracefully();
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/WebSocketInitializer.java b/board-server/src/main/java/net/stzups/board/server/WebSocketInitializer.java
deleted file mode 100644
index 9a8a1bc7..00000000
--- a/board-server/src/main/java/net/stzups/board/server/WebSocketInitializer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.stzups.board.server;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import io.netty.util.AttributeKey;
-import net.stzups.board.data.objects.HttpSession;
-import net.stzups.board.server.websocket.PacketHandler;
-
-import java.net.InetSocketAddress;
-
-@ChannelHandler.Sharable
-public class WebSocketInitializer extends ChannelInboundHandlerAdapter {
-    public static final AttributeKey<HttpSession> HTTP_SESSION_KEY = AttributeKey.valueOf(WebSocketInitializer.class, "HTTP_SESSION");
-
-    @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object event) {
-        if (event instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
-            WebSocketServerProtocolHandler.HandshakeComplete handshakeComplete = (WebSocketServerProtocolHandler.HandshakeComplete) event;
-            ctx.channel().attr(HTTP_SESSION_KEY).set(HttpSession.getSession(handshakeComplete.requestHeaders(), ((InetSocketAddress) ctx.channel().remoteAddress()).getAddress()));
-            ctx.pipeline().addLast(new PacketHandler());
-        }
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/http/HttpServerHandler.java b/board-server/src/main/java/net/stzups/board/server/http/HttpServerHandler.java
deleted file mode 100644
index 896f29e6..00000000
--- a/board-server/src/main/java/net/stzups/board/server/http/HttpServerHandler.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package net.stzups.board.server.http;
-
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.DefaultFileRegion;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.codec.http.DefaultFullHttpResponse;
-import io.netty.handler.codec.http.DefaultHttpResponse;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpChunkedInput;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpUtil;
-import io.netty.handler.codec.http.HttpHeaderValues;
-import io.netty.handler.codec.http.HttpResponse;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.codec.http.LastHttpContent;
-import io.netty.handler.codec.http.cookie.ClientCookieEncoder;
-import io.netty.handler.codec.http.cookie.Cookie;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.handler.stream.ChunkedFile;
-import io.netty.util.CharsetUtil;
-import net.stzups.board.Board;
-import net.stzups.board.data.objects.HttpSession;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
-import java.net.InetSocketAddress;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.regex.Pattern;
-
-/**
- * Handles HTTP requests
- * modified from https://netty.io/4.1/xref/io/netty/example/http/file/HttpStaticFileServerHandler.html
- */
-public class HttpServerHandler extends SimpleChannelInboundHandler<FullHttpRequest> {
-    private static final File HTTP_ROOT = new File(Board.getConfig().get("document.root.path", "documentRoot"));
-    static {
-        if (!HTTP_ROOT.exists()) {
-            if (!HTTP_ROOT.mkdirs()) {
-                throw new RuntimeException(new IOException("Failed to create directory at " + HTTP_ROOT.getPath()));
-            }
-        }
-    }
-    private static final String HTTP_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz";
-    private static final String HTTP_DATE_GMT_TIMEZONE = "GMT";
-    private static final int HTTP_CACHE_SECONDS = Board.getConfig().getInt("http.cache.time", 0);
-    private static final String JOIN_PATH = "d";
-
-    private static final SimpleDateFormat dateFormatter = new SimpleDateFormat(HTTP_DATE_FORMAT, Locale.US);
-    private static final Calendar time = new GregorianCalendar();
-
-    static {
-        dateFormatter.setTimeZone(TimeZone.getTimeZone(HTTP_DATE_GMT_TIMEZONE));
-    }
-
-    private FullHttpRequest request;
-
-    /**
-     * Currently only handles GET requests, will search working directory for files to serve
-     * Serves index.html if a directory is requested
-     */
-    @Override
-    public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception {
-        if (request.uri().equals("/index.html")) {
-
-            System.out.println("START================================================================");
-            System.out.println(request.uri());
-            for (Map.Entry<String, String> entry : request.headers()) {
-                System.out.println(entry.getKey() + ":" + entry.getValue());
-            }
-            System.out.println();
-            System.out.println(request.content().toString(StandardCharsets.UTF_8));
-            System.out.println("END==================================================================");
-        }
-        this.request = request;
-        if (!request.decoderResult().isSuccess()) {
-            sendError(ctx, HttpResponseStatus.BAD_REQUEST);
-            return;
-        }
-
-        if (!HttpMethod.GET.equals(request.method())) {
-            this.sendError(ctx, HttpResponseStatus.METHOD_NOT_ALLOWED);
-            return;
-        }
-
-        final boolean keepAlive = HttpUtil.isKeepAlive(request);
-
-        final String uri = sanitizeUri(request.uri());
-        if (uri == null) {
-            sendError(ctx, HttpResponseStatus.FORBIDDEN);
-            return;
-        }
-        final String path;
-        // special cases
-        if (uri.startsWith("/" + JOIN_PATH + "/")) {// /JOIN_PATH/123456 -> index.html
-            path = "/index.html";
-        } else if (!uri.endsWith("/") && !uri.contains(".")) {// /file -> /file.html
-            path = uri + ".html";
-        } else if (uri.endsWith("/")) {// /directory/ -> /directory/index.html
-            path = uri + "index.html";
-        } else {
-            path = uri;
-        }
-
-        File file = new File(HTTP_ROOT, path.replace('/', File.separatorChar));
-        if (file.isHidden() || !file.exists()) {
-            sendError(ctx, HttpResponseStatus.NOT_FOUND);
-            return;
-        }
-
-        if (file.isDirectory()) {
-            sendError(ctx, HttpResponseStatus.FORBIDDEN);
-            return;
-        }
-
-        if (!file.isFile()) {
-            sendError(ctx, HttpResponseStatus.FORBIDDEN);
-            return;
-        }
-
-        // Cache Validation
-        String ifModifiedSince = request.headers().get(HttpHeaderNames.IF_MODIFIED_SINCE);
-        if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
-            Date ifModifiedSinceDate = dateFormatter.parse(ifModifiedSince);
-
-            // Only compare up to the second because the datetime format we send to the client
-            // does not have milliseconds
-            long ifModifiedSinceDateSeconds = ifModifiedSinceDate.getTime() / 1000;
-            long fileLastModifiedSeconds = file.lastModified() / 1000;
-            if (ifModifiedSinceDateSeconds == fileLastModifiedSeconds) {
-                sendNotModified(ctx);
-                return;
-            }
-        }
-
-        RandomAccessFile raf;
-        try {
-            raf = new RandomAccessFile(file, "r");
-        } catch (FileNotFoundException ignore) {
-            sendError(ctx, HttpResponseStatus.NOT_FOUND);
-            return;
-        }
-        long fileLength = raf.length();
-
-        HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK);
-        if (path.equals("/index.html")) {
-            Cookie cookie = HttpSession.getCookie(request.headers(), ((InetSocketAddress) ctx.channel().remoteAddress()).getAddress());
-            if (cookie != null) {
-                System.out.println(cookie.value());
-                response.headers().set(HttpHeaderNames.SET_COOKIE, ClientCookieEncoder.STRICT.encode(cookie));
-            }
-        }
-        HttpUtil.setContentLength(response, fileLength);
-        setContentTypeHeader(response, file);
-        setDateAndCacheHeaders(response, file);
-
-        if (!keepAlive) {
-            response.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE);
-        } else if (request.protocolVersion().equals(HttpVersion.HTTP_1_0)) {
-            response.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
-        }
-
-        // Write the initial line and the header.
-        ctx.write(response);
-
-        // Write the content.
-        ChannelFuture lastContentFuture;
-        if (ctx.pipeline().get(SslHandler.class) == null) {
-            ctx.write(new DefaultFileRegion(raf.getChannel(), 0, fileLength), ctx.newProgressivePromise());
-            // Write the end marker.
-            lastContentFuture = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
-        } else {
-            // HttpChunkedInput will write the end marker (LastHttpContent) for us.
-            lastContentFuture = ctx.writeAndFlush(new HttpChunkedInput(new ChunkedFile(raf, 0, fileLength, 8192)), ctx.newProgressivePromise());
-        }
-
-        // Decide whether to close the connection or not.
-        if (!keepAlive) {
-            // Close the connection when the whole content is written out.
-            lastContentFuture.addListener(ChannelFutureListener.CLOSE);
-        }
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        if (ctx.channel().isActive()) {
-            sendError(ctx, HttpResponseStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    private static final Pattern INSECURE_URI = Pattern.compile(".*[<>&\"].*");
-
-    /**
-     * Simplistic dumb security check for client request uris
-     * Will also replace file separators (/ or \) with the system specific separator
-     *
-     * @param uri request uri from client
-     * @return sanitized uri or null if the uri is unsafe and should not be handled
-     */
-    private static String sanitizeUri(String uri) {
-        // Decode the path.
-        try {
-            uri = URLDecoder.decode(uri, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            return null;
-        }
-
-        if (uri.isEmpty() || uri.charAt(0) != '/') {
-            return null;
-        }
-
-        if (uri.contains("/.") || uri.contains("./") ||
-                uri.charAt(0) == '.' || uri.charAt(uri.length() - 1) == '.' ||
-                INSECURE_URI.matcher(uri).matches()) {
-            return null;
-        }
-
-        return uri;
-    }
-
-    private void sendRedirect(ChannelHandlerContext ctx, String newUri) {
-        FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.FOUND, Unpooled.EMPTY_BUFFER);
-        response.headers().set(HttpHeaderNames.LOCATION, newUri);
-
-        sendAndCleanupConnection(ctx, response);
-    }
-
-    private void sendError(ChannelHandlerContext ctx, HttpResponseStatus status) {//todo fail2ban system where bad clients get blocked
-        FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, status, Unpooled.copiedBuffer(status + "\r\n", CharsetUtil.UTF_8));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain; charset=UTF-8");
-
-        sendAndCleanupConnection(ctx, response);
-    }
-
-    private void sendNotModified(ChannelHandlerContext ctx) {
-        FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_MODIFIED, Unpooled.EMPTY_BUFFER);
-        setDateHeader(response);
-
-        sendAndCleanupConnection(ctx, response);
-    }
-
-    private void sendAndCleanupConnection(ChannelHandlerContext ctx, FullHttpResponse response) {
-        final FullHttpRequest request = this.request;
-        final boolean keepAlive = HttpUtil.isKeepAlive(request);
-        HttpUtil.setContentLength(response, response.content().readableBytes());
-        if (!keepAlive) {
-            // We're going to close the connection as soon as the response is sent,
-            // so we should also make it clear for the client.
-            response.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE);
-        } else if (request.protocolVersion().equals(HttpVersion.HTTP_1_0)) {
-            response.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
-        }
-
-        ChannelFuture flushPromise = ctx.writeAndFlush(response);
-
-        if (!keepAlive) {
-            // Close the connection as soon as the response is sent.
-            flushPromise.addListener(ChannelFutureListener.CLOSE);
-        }
-    }
-
-    private static void setDateHeader(FullHttpResponse response) {
-        response.headers().set(HttpHeaderNames.DATE, dateFormatter.format(time.getTime()));
-    }
-
-    private static void setDateAndCacheHeaders(HttpResponse response, File fileToCache) {
-        if (HTTP_CACHE_SECONDS > 0) {
-            // Date header
-            Calendar time = new GregorianCalendar();
-            response.headers().set(HttpHeaderNames.DATE, dateFormatter.format(time.getTime()));
-
-            // Add cache headers
-            time.add(Calendar.SECOND, HTTP_CACHE_SECONDS);
-            response.headers().set(HttpHeaderNames.EXPIRES, dateFormatter.format(time.getTime()));
-            response.headers().set(HttpHeaderNames.CACHE_CONTROL, "private, max-age=" + HTTP_CACHE_SECONDS);
-            response.headers().set(HttpHeaderNames.LAST_MODIFIED, dateFormatter.format(new Date(fileToCache.lastModified())));
-        } else {
-            response.headers().set(HttpHeaderNames.CACHE_CONTROL, "no-store");
-        }
-    }
-
-    private static void setContentTypeHeader(HttpResponse response, File file) {
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, MimeTypes.getMimeTypeFromExtension(file));
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/http/MimeTypes.java b/board-server/src/main/java/net/stzups/board/server/http/MimeTypes.java
deleted file mode 100644
index 3774a016..00000000
--- a/board-server/src/main/java/net/stzups/board/server/http/MimeTypes.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package net.stzups.board.server.http;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Simple utility class that looks for a META-INF/mime.types file from resources and provides MIME type mappings.
- * mime.types should be formatted as follows:
- * text/html htm html
- * image/jpeg jpg jpeg
- * application/javascript js
- */
-public class MimeTypes {
-    private static final String MIME_TYPES_FILE_PATH = "/META-INF/mime.types";
-    private static final String DEFAULT_MIME_TYPE = "application/octet-stream";
-
-    private static Map<String, String> extensionMimeTypeMap = new HashMap<>();
-
-    static {
-        try {
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(MimeTypes.class.getResourceAsStream(MIME_TYPES_FILE_PATH)));
-            for (String line; (line = bufferedReader.readLine()) != null;) {
-                String[] split = line.split("\\s");
-                if (split.length > 1) {
-                    for (int i = 1; i < split.length; i++) {
-                        extensionMimeTypeMap.put(split[i], split[0]);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            new IOException("Exception while loading MIME types from mime.types resource", e).printStackTrace();
-        }
-    }
-
-    /**
-     * Gets a MIME type for the extension from the path of a {@link java.io.File}.
-     *
-     * @param file the file
-     * @return the MIME type for the given file, or a default type
-     */
-    public static String getMimeTypeFromExtension(File file) {
-        return getMimeTypeFromExtension(file.getPath());
-    }
-
-    /**
-     * Gets a MIME type for an extension.
-     *
-     * @param extension the extension, can include or exclude the file separator ("html" or ".html" both work)
-     * @return the MIME type for the given extension, or a default type
-     */
-    public static String getMimeTypeFromExtension(String extension) {
-        int i = extension.lastIndexOf(".");
-        if (i != -1) {
-            extension = extension.substring(i + 1);
-        }
-        return extensionMimeTypeMap.getOrDefault(extension, DEFAULT_MIME_TYPE);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/PacketHandler.java b/board-server/src/main/java/net/stzups/board/server/websocket/PacketHandler.java
deleted file mode 100644
index fe81d2ea..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/PacketHandler.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package net.stzups.board.server.websocket;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import net.stzups.board.Board;
-import net.stzups.board.data.objects.Document;
-import net.stzups.board.data.objects.User;
-import net.stzups.board.data.objects.UserSession;
-import net.stzups.board.server.websocket.protocol.client.ClientPacket;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketCreateDocument;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketDraw;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketHandshake;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketOpenDocument;
-import net.stzups.board.server.websocket.protocol.server.ServerPacketAddDocument;
-import net.stzups.board.server.websocket.protocol.server.ServerPacketAddUser;
-import net.stzups.board.server.websocket.protocol.server.ServerPacketDrawClient;
-import net.stzups.board.server.WebSocketInitializer;
-import net.stzups.board.server.websocket.protocol.server.ServerPacketHandshake;
-
-import java.net.InetSocketAddress;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PacketHandler extends SimpleChannelInboundHandler<ClientPacket> {
-    private static Map<Document, Room> documents = new HashMap<>();
-    private Room room;
-    private Client client;
-
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) {
-        if (room != null) {
-            room.removeClient(client);
-        }
-    }
-
-    @Override
-    public void handlerAdded(ChannelHandlerContext ctx) {
-        System.out.println(ctx.channel().hasAttr(WebSocketInitializer.HTTP_SESSION_KEY));
-        System.out.println(ctx.channel().attr(WebSocketInitializer.HTTP_SESSION_KEY).get());
-    }
-
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, ClientPacket packet) {
-        switch (packet.getPacketType()) {
-            case DRAW: {
-                ClientPacketDraw clientPacketDraw = (ClientPacketDraw) packet;
-                room.getDocument().addPoints(client.getUser(), clientPacketDraw.getPoints());
-                room.queuePacketExcept(new ServerPacketDrawClient(client, clientPacketDraw.getPoints()), client);//todo this has tons of latency
-                break;
-            }
-            case OPEN_DOCUMENT: {
-                ClientPacketOpenDocument clientPacketOpenDocument = (ClientPacketOpenDocument) packet;
-                Document document = Board.getDocument(clientPacketOpenDocument.getId());
-                if (document != null) {
-                    if (room != null) {
-                        room.removeClient(client);
-                    }
-                    room = getRoom(document);
-                    room.addClient(client);
-                } else {
-                    System.out.println(client + " tried to open document not that does not exist");
-                }
-                break;
-            }
-            case CREATE_DOCUMENT: {
-                ClientPacketCreateDocument clientPacketCreateDocument = (ClientPacketCreateDocument) packet;
-                if (room != null) {
-                    room.removeClient(client);
-                }
-                try {
-                    room = getRoom(Board.createDocument(client.getUser()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                client.sendPacket(new ServerPacketAddDocument(room.getDocument()));
-                room.addClient(client);
-                break;
-            }
-            case HANDSHAKE: {
-                ClientPacketHandshake clientPacketHandshake = (ClientPacketHandshake) packet;
-                if (client == null) {
-                    if (clientPacketHandshake.getToken() == 0) {
-                        System.out.println("user authed with empty session");
-                        client = createUserSession(ctx, null);
-                    } else {
-                        UserSession userSession = Board.removeUserSession(clientPacketHandshake.getToken());
-                        if (userSession == null) {
-                            System.out.println("user tried authenticating with nonexistant session");
-                            client = createUserSession(ctx, null);
-                        } else if (!userSession.validate(((InetSocketAddress) ctx.channel().remoteAddress()).getAddress())) {
-                            System.out.println("user tried authenticating with invalid session" + userSession);
-                            client = createUserSession(ctx, null);
-                        } else {
-                            System.out.println("good user session");
-                            User user = Board.getUser(userSession.getUserId());
-                            if (user == null) {
-                                System.out.println("very bad user does not exist");
-                            }
-                            client = createUserSession(ctx, user);
-                        }
-                    }
-                }
-                client.queuePacket(new ServerPacketAddUser(client.getUser()));
-                if (client.getUser().getOwnedDocuments().size() == 0) {
-                    client.queuePacket(new ServerPacketAddDocument(Board.createDocument(client.getUser())));
-                } else {
-                    for (long id : client.getUser().getOwnedDocuments()) {
-                        client.queuePacket(new ServerPacketAddDocument(Board.getDocument(id)));
-                    }
-                }
-                client.flushPackets();
-
-                break;
-            }
-            default:
-                throw new UnsupportedOperationException("Unsupported packet type " + packet.getPacketType() + " sent by " + client);
-        }
-    }
-
-    private static Client createUserSession(ChannelHandlerContext ctx, User user) {
-        Client client;
-        if (user == null) {
-            client = new Client(new User(), ctx.channel());
-            Board.addUser(client.getUser());
-        } else {
-            client = new Client(user, ctx.channel());
-        }
-        UserSession userSession = new UserSession(client.getUser(), ((InetSocketAddress) ctx.channel().remoteAddress()).getAddress());
-        Board.addUserSession(userSession);
-        client.queuePacket(new ServerPacketHandshake(userSession));
-        return client;
-    }
-
-    /**
-     * Gets or creates a room for an existing document
-     *
-     * @param document the existing document
-     * @return the live room
-     */
-    private static Room getRoom(Document document) {
-        Room r = documents.get(document);
-        if (r == null) {
-            r =  Room.createRoom(document);
-            documents.put(r.getDocument(), r);
-        }
-        return r;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/Room.java b/board-server/src/main/java/net/stzups/board/server/websocket/Room.java
deleted file mode 100644
index 1e4308d4..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/Room.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package net.stzups.board.server.websocket;
-
-import net.stzups.board.Board;
-import net.stzups.board.data.objects.Document;
-import net.stzups.board.data.objects.User;
-import net.stzups.board.server.websocket.protocol.server.ServerPacket;
-import net.stzups.board.server.websocket.protocol.server.ServerPacketAddClient;
-import net.stzups.board.server.websocket.protocol.server.ServerPacketOpenDocument;
-import net.stzups.board.server.websocket.protocol.server.ServerPacketRemoveClient;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-
-class Room {
-    private static final int SEND_PERIOD = 1000;
-
-    private static List<Room> rooms = new ArrayList<>();
-    static {//todo send some packets instantly and refactor to somewhere?
-        new Timer().scheduleAtFixedRate(new TimerTask() {
-            @Override
-            public void run() {
-                for (Room room : rooms) {
-                    for (Client client : room.clients) {
-                        client.flushPackets();
-                    }
-                }
-            }
-        }, 0, SEND_PERIOD);
-    }
-
-    private Set<Client> clients = new HashSet<>();
-
-    private Document document;
-    private Room(Document document) {
-        this.document = document;
-    }
-
-    /**
-     * Creates a new room with a random id
-     *
-     * @return the created room
-     */
-    static Room createRoom(Document document) {
-        Room room = new Room(document);
-        rooms.add(room);
-        return room;
-    }
-
-    Document getDocument() {
-        return document;
-    }
-
-    /**
-     * Creates a new client using its channel.
-     * todo
-     */
-    void addClient(Client client) {
-
-        //for the new client
-        client.sendPacket(new ServerPacketOpenDocument(document));
-        //for the existing clients
-        sendPacket(new ServerPacketAddClient(client));
-        clients.add(client);
-        Board.getLogger().info("Added " + client + " to " + this);
-    }
-
-    /**
-     * Removes given client from room
-     *
-     * @param client client to remove
-     */
-    void removeClient(Client client) {
-        clients.remove(client);
-        sendPacket(new ServerPacketRemoveClient(client));
-        Board.getLogger().info("Removed " + client + " to " + this);
-    }
-
-    /**
-     * Send given packet to all members of the room except for the specified client
-     *
-     * @param serverPacket packet to send
-     * @param except client to exclude
-     */
-    void sendPacketExcept(ServerPacket serverPacket, Client except) {
-        for (Client client : clients) {
-            if (except != client) {
-                client.sendPacket(serverPacket);
-            }
-        }
-    }
-
-    /**
-     * Send given packet to all clients of this room
-     *
-     * @param serverPacket the packet to send
-     */
-    void sendPacket(ServerPacket serverPacket) {
-        for (Client client : clients) {
-            client.sendPacket(serverPacket);
-        }
-    }
-
-    void queuePacketExcept(ServerPacket serverPacket, Client except) {
-        for (Client client : clients) {
-            if (except != client) {
-                client.queuePacket(serverPacket);
-            }
-        }
-    }
-
-    void queuePacket(ServerPacket serverPacket) {
-        for (Client client : clients) {
-            client.queuePacket(serverPacket);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "Room{document=" + document + "}";
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/PacketDecoder.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/PacketDecoder.java
deleted file mode 100644
index 494c1232..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/PacketDecoder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package net.stzups.board.server.websocket.protocol;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.WebSocketFrame;
-import net.stzups.board.data.objects.Point;
-import net.stzups.board.server.websocket.protocol.client.ClientPacket;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketCreateDocument;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketDraw;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketHandshake;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketOpenDocument;
-import net.stzups.board.server.websocket.protocol.client.ClientPacketType;
-
-import javax.naming.OperationNotSupportedException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-/**
- * Decodes a WebSocketFrame sent by the client to a ClientPacket
- */
-@ChannelHandler.Sharable
-public class PacketDecoder extends MessageToMessageDecoder<WebSocketFrame> {
-    @Override
-    protected void decode(ChannelHandlerContext ctx, WebSocketFrame webSocketFrame, List<Object> list) throws Exception {
-        if (webSocketFrame instanceof TextWebSocketFrame) {
-            System.out.println(((TextWebSocketFrame) webSocketFrame).text());
-        } else if (webSocketFrame instanceof BinaryWebSocketFrame) {
-            ByteBuf byteBuf = webSocketFrame.content();
-            ClientPacketType packetType = ClientPacketType.valueOf(byteBuf.readUnsignedByte());
-            System.out.println("recv " + packetType);
-            ClientPacket packet;
-            switch (packetType) {
-                case DRAW:
-                    Point[] points = new Point[byteBuf.readUnsignedByte()];
-                    for (int i = 0; i < points.length; i++) {
-                        points[i] = new Point(byteBuf.readUnsignedByte(), byteBuf.readShort(), byteBuf.readShort());
-                    }
-                    packet = new ClientPacketDraw(points);
-                    break;
-                case OPEN_DOCUMENT:
-                    packet = new ClientPacketOpenDocument(byteBuf.readLong());
-                    break;
-                case CREATE_DOCUMENT:
-                    packet = new ClientPacketCreateDocument();
-                    break;
-                case HANDSHAKE:
-                    packet = new ClientPacketHandshake(byteBuf.readLong());
-                    break;
-                default:
-                    throw new OperationNotSupportedException("Unsupported packet type " + packetType+ " while decoding");
-            }
-            list.add(packet);
-        }
-    }
-
-    private String readString(ByteBuf byteBuf) {
-        byte[] buffer = new byte[byteBuf.readUnsignedByte()];
-        byteBuf.readBytes(buffer);
-        return new String(buffer, StandardCharsets.UTF_8);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacket.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacket.java
deleted file mode 100644
index 761da7ac..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacket.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.stzups.board.server.websocket.protocol.client;
-
-/**
- * Represents a packet sent by the client
- */
-public abstract class ClientPacket {
-    private ClientPacketType packetType;
-
-    ClientPacket(ClientPacketType packetType) {
-        this.packetType = packetType;
-    }
-
-    public ClientPacketType getPacketType() {
-        return packetType;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketCreateDocument.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketCreateDocument.java
deleted file mode 100644
index a02beb26..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketCreateDocument.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.stzups.board.server.websocket.protocol.client;
-
-public class ClientPacketCreateDocument extends ClientPacket {
-    public ClientPacketCreateDocument() {
-        super(ClientPacketType.CREATE_DOCUMENT);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketDraw.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketDraw.java
deleted file mode 100644
index 35379dcc..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketDraw.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.stzups.board.server.websocket.protocol.client;
-
-import net.stzups.board.data.objects.Point;
-
-public class ClientPacketDraw extends ClientPacket {
-    private Point[] points;
-
-    public ClientPacketDraw(Point[] points) {
-        super(ClientPacketType.DRAW);
-        this.points = points;
-    }
-
-    public Point[] getPoints() {
-        return points;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketHandshake.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketHandshake.java
deleted file mode 100644
index 3518625e..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketHandshake.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package net.stzups.board.server.websocket.protocol.client;
-
-public class ClientPacketHandshake extends ClientPacket {
-    private long token;
-
-    public ClientPacketHandshake(long token) {
-        super(ClientPacketType.HANDSHAKE);
-        this.token = token;
-    }
-
-    public long getToken() {
-        return token;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketOpenDocument.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketOpenDocument.java
deleted file mode 100644
index bbbbcaf4..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketOpenDocument.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package net.stzups.board.server.websocket.protocol.client;
-
-public class ClientPacketOpenDocument extends ClientPacket {
-    private long id;
-
-    public ClientPacketOpenDocument(long id) {
-        super(ClientPacketType.OPEN_DOCUMENT);
-        this.id = id;
-    }
-
-    public long getId() {
-        return id;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketType.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketType.java
deleted file mode 100644
index 6a83ebe7..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/client/ClientPacketType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.stzups.board.server.websocket.protocol.client;
-
-import io.netty.util.collection.IntObjectHashMap;
-
-import java.util.EnumSet;
-import java.util.Map;
-
-public enum ClientPacketType {
-    OPEN_DOCUMENT(0),
-    DRAW(1),
-    CREATE_DOCUMENT(2),
-    HANDSHAKE(3),
-    ;
-
-    private static Map<Integer, ClientPacketType> packetTypeMap = new IntObjectHashMap<>();
-    static {
-        for (ClientPacketType packetType : EnumSet.allOf(ClientPacketType.class)) {
-            packetTypeMap.put(packetType.id, packetType);
-        }
-    }
-
-    private int id;
-
-    ClientPacketType(int id) {
-        this.id = id;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public static ClientPacketType valueOf(int id) {
-        ClientPacketType packetType = packetTypeMap.get(id);
-        if (packetType == null) {
-            throw new IllegalArgumentException("Unknown PacketType for given id " + id);
-        }
-        return packetType;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddClient.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddClient.java
deleted file mode 100644
index 5d89a0e6..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddClient.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.server.websocket.Client;
-
-public class ServerPacketAddClient extends ServerPacketClient {
-    private Client client;
-
-    public ServerPacketAddClient(Client client) {
-        super(ServerPacketType.ADD_CLIENT, client);
-        this.client = client;
-    }
-
-    @Override
-    public void serialize(ByteBuf byteBuf) {
-        super.serialize(byteBuf);
-        byteBuf.writeLong(client.getUser().getId());
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddDocument.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddDocument.java
deleted file mode 100644
index 909035f0..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddDocument.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.data.objects.Document;
-
-public class ServerPacketAddDocument extends ServerPacket {
-    private Document document;
-
-    public ServerPacketAddDocument(Document document) {
-        super(ServerPacketType.ADD_DOCUMENT);
-        this.document = document;
-    }
-
-    @Override
-    public void serialize(ByteBuf byteBuf) {
-        super.serialize(byteBuf);
-        byteBuf.writeLong(document.getId());
-        writeString(document.getName(), byteBuf);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddUser.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddUser.java
deleted file mode 100644
index e87f0a3d..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketAddUser.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.data.objects.User;
-
-public class ServerPacketAddUser extends ServerPacketUser {
-    public ServerPacketAddUser(User user) {
-        super(ServerPacketType.ADD_USER, user);
-    }
-
-    @Override
-    public void serialize(ByteBuf byteBuf) {
-        super.serialize(byteBuf);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketClient.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketClient.java
deleted file mode 100644
index c9a332ea..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketClient.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.data.objects.User;
-import net.stzups.board.server.websocket.Client;
-
-public abstract class ServerPacketClient extends ServerPacket {
-    private short id;
-
-    ServerPacketClient(ServerPacketType packetType, Client client) {
-        super(packetType);
-        this.id = client == null ? 0 : client.getId();
-    }
-
-    @Override
-    public void serialize(ByteBuf byteBuf) {
-        super.serialize(byteBuf);
-        byteBuf.writeShort(id);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketDrawClient.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketDrawClient.java
deleted file mode 100644
index bc43b03b..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketDrawClient.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.data.objects.Point;
-import net.stzups.board.data.objects.User;
-import net.stzups.board.server.websocket.Client;
-
-public class ServerPacketDrawClient extends ServerPacketClient {
-    private Point[] points;
-
-    public ServerPacketDrawClient(Client client, Point[] points) {
-        super(ServerPacketType.DRAW, client);
-        this.points = points;
-    }
-
-    @Override
-    public void serialize(ByteBuf byteBuf) {
-        super.serialize(byteBuf);
-        byteBuf.writeShort((short) points.length);
-        for (Point point : points) {
-            byteBuf.writeByte((byte) point.dt);
-            byteBuf.writeShort(point.x);
-            byteBuf.writeShort(point.y);
-        }
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketHandshake.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketHandshake.java
deleted file mode 100644
index 96dca937..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketHandshake.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.data.objects.UserSession;
-
-public class ServerPacketHandshake extends ServerPacket {
-    private long token;
-    private long userId;
-
-    public ServerPacketHandshake(UserSession userSession) {
-        super(ServerPacketType.HANDSHAKE);
-        this.token = userSession.getToken();
-        this.userId = userSession.getUserId();
-    }
-
-    @Override
-    public void serialize(ByteBuf bytebuf) {
-        super.serialize(bytebuf);
-        bytebuf.writeLong(token);
-        bytebuf.writeLong(userId);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketOpenDocument.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketOpenDocument.java
deleted file mode 100644
index 428064d1..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketOpenDocument.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.data.objects.Point;
-import net.stzups.board.data.objects.Document;
-import net.stzups.board.data.objects.User;
-
-import java.util.List;
-import java.util.Map;
-
-public class ServerPacketOpenDocument extends ServerPacket {
-    private Document document;
-
-    public ServerPacketOpenDocument(Document document) {
-        super(ServerPacketType.OPEN_DOCUMENT);
-        this.document = document;
-    }
-
-    @Override
-    public void serialize(ByteBuf byteBuf) {
-        super.serialize(byteBuf);
-        byteBuf.writeLong(document.getId());
-        //OPEN_DOCUMENT is serialized, now serialize the other things
-        byteBuf.writeShort((short) document.getPoints().size());
-        for (Map.Entry<User, List<Point>> entry : document.getPoints().entrySet()) {
-            byteBuf.writeLong(entry.getKey().getId());
-            byteBuf.writeShort((short) entry.getValue().size());
-            for (Point point : entry.getValue()) {
-                int dt = point.dt;
-                if (dt != 0) {
-                    dt = -1;
-                }
-                byteBuf.writeByte((byte) dt);
-                byteBuf.writeShort(point.x);
-                byteBuf.writeShort(point.y);
-            }
-        }
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketRemoveClient.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketRemoveClient.java
deleted file mode 100644
index 33e6c385..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketRemoveClient.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import net.stzups.board.server.websocket.Client;
-
-public class ServerPacketRemoveClient extends ServerPacketClient {
-    public ServerPacketRemoveClient(Client client) {
-        super(ServerPacketType.REMOVE_CLIENT, client);
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketType.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketType.java
deleted file mode 100644
index bd3fecfa..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.util.collection.IntObjectHashMap;
-
-import java.util.EnumSet;
-import java.util.Map;
-
-public enum ServerPacketType {
-    ADD_CLIENT(0),
-    REMOVE_CLIENT(1),
-    DRAW(2),
-    OPEN_DOCUMENT(3),
-    ADD_DOCUMENT(4),
-    HANDSHAKE(5),
-    ADD_USER(6)
-    ;
-
-    private static Map<Integer, ServerPacketType> packetTypeMap = new IntObjectHashMap<>();
-    static {
-        for (ServerPacketType packetType : EnumSet.allOf(ServerPacketType.class)) {
-            packetTypeMap.put(packetType.id, packetType);
-        }
-    }
-
-    private int id;
-
-    ServerPacketType(int id) {
-        this.id = id;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public static ServerPacketType valueOf(int id) {
-        ServerPacketType packetType = packetTypeMap.get(id);
-        if (packetType == null) {
-            throw new IllegalArgumentException("Unknown PacketTypeServer for given id " + id);
-        }
-        return packetType;
-    }
-}
diff --git a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketUser.java b/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketUser.java
deleted file mode 100644
index 7b8e90b8..00000000
--- a/board-server/src/main/java/net/stzups/board/server/websocket/protocol/server/ServerPacketUser.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.stzups.board.server.websocket.protocol.server;
-
-import io.netty.buffer.ByteBuf;
-import net.stzups.board.data.objects.User;
-
-public abstract class ServerPacketUser extends ServerPacket {
-    private User user;
-
-    ServerPacketUser(ServerPacketType serverPacketType, User user) {
-        super(serverPacketType);
-        this.user = user;
-    }
-
-    @Override
-    public void serialize(ByteBuf byteBuf) {
-        super.serialize(byteBuf);
-        byteBuf.writeLong(user.getId());
-    }
-}
diff --git a/board-server/src/main/resources/META-INF/mime.types b/board-server/src/main/resources/META-INF/mime.types
deleted file mode 100644
index a2de552d..00000000
--- a/board-server/src/main/resources/META-INF/mime.types
+++ /dev/null
@@ -1,5 +0,0 @@
-application/javascript js
-text/css css
-image/x-icon ico
-text/html htm html
-image/png png
\ No newline at end of file
diff --git a/board-web-client/about-board.html b/board-web-client/about-board.html
deleted file mode 100644
index bb144e4c..00000000
--- a/board-web-client/about-board.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <title>About | Board</title>
-        <link rel="stylesheet" href="style.css">
-    </head>
-    <body>
-        <header>
-            <a href="/">board</a>
-            <a href="/about-board">about</a>
-        </header>
-        <h1>this is a very cool website that you should totally tell all your friend about</h1>
-    </body>
-</html>
\ No newline at end of file
diff --git a/board-web-client/scripts/Client.js b/board-web-client/scripts/Client.js
deleted file mode 100644
index 7ae2dc2f..00000000
--- a/board-web-client/scripts/Client.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import {clientsToolbar, ctx} from './Document.js'
-
-export default class Client {
-    constructor(id, user) {
-        this.id = id;
-        this.user = user;
-        this.x = 0;
-        this.y = 0;
-        this.points = [];
-        this.icon = document.createElement('img');
-        this.icon.setAttribute('src', '/bin/default.png');
-        this.icon.addEventListener('mouseenter', (event) => {
-            let rect = this.icon.getBoundingClientRect();
-            this.iconTooltip.style.visibility = 'visible';
-            this.iconTooltip.style.top = rect.top + 'px';
-            this.iconTooltip.style.left = rect.left + -50 + 'px';
-        })
-        this.icon.addEventListener('mouseleave', (event) => {
-            this.iconTooltip.style.visibility = 'hidden';
-        })
-        this.iconTooltip = document.createElement('div');
-        if (user != null) {
-            this.iconTooltip.innerText = user.id;
-        }
-        this.iconTooltip.style.position = 'absolute';
-        this.iconTooltip.style.visibility = 'hidden';
-        this.iconTooltip.style.zIndex = '1000';
-        this.iconTooltip.style.color = 'black';
-        document.getElementsByTagName('body')[0].parentNode.appendChild(this.iconTooltip);
-    }
-
-    draw(dt) {
-        ctx.beginPath();
-        ctx.moveTo(this.x, this.y);
-        while (this.points.length > 0 && dt > 0) {
-            //console.log(this.points.length);
-            let point = this.points[0];
-            if (point.dt === 255) {
-                this.x = point.x;
-                this.y = point.y;
-                ctx.lineTo(this.x, this.y);
-                this.points.splice(0, 1);
-                
-                continue;
-            }
-            if (point.dt === 0) {
-                ctx.stroke();//todo only do this at the end
-                this.x = point.x;
-                this.y = point.y;
-                ctx.moveTo(this.x, this.y);
-                this.points.splice(0, 1);
-                continue;
-            }
-
-            if (dt + point.usedDt < point.dt) {
-                let multiplier = (dt + point.usedDt) / point.dt;
-                ctx.lineTo(lerp(this.x, point.x, multiplier), lerp(this.y, point.y, multiplier));
-
-                point.usedDt += dt;
-                dt = 0;
-            } else {
-                this.x = point.x;
-                this.y = point.y;
-                ctx.lineTo(this.x, this.y);
-
-                dt -= point.dt + point.usedDt;
-                
-                this.points.splice(0, 1);
-            }
-        }
-        ctx.stroke();
-    }
-}
-
-function lerp(v0, v1, t) {
-    return v0 * (1 - t) + v1 * t;
-}
\ No newline at end of file
diff --git a/board-web-client/scripts/Document.js b/board-web-client/scripts/Document.js
deleted file mode 100644
index 6d5ddcb2..00000000
--- a/board-web-client/scripts/Document.js
+++ /dev/null
@@ -1,151 +0,0 @@
-export const canvas = document.getElementById('canvas');
-export const ctx = canvas.getContext('2d');
-
-import LocalClient from './LocalClient.js';
-import SidebarItem from './SidebarItem.js';
-import Client from './Client.js'
-import socket from './WebSocketHandler.js'
-import * as User from "./User.js";
-
-const documents = new Map();
-let activeDocument = null;
-export const clientsToolbar = document.getElementById("clientsToolbar");
-
-class Document {
-    constructor(name, id) {
-        this.clients = new Map();
-        this.name = name;
-        this.id = id;
-        this.sidebarItem = new SidebarItem(this.name, () => {
-            if (this.id != null) {
-                if (activeDocument != null) activeDocument.close();
-                socket.sendOpen(this.id)
-            } else {
-                console.log('id was null', this);
-            }
-        });
-        documents.set(this.id, this);
-        this.points = {};
-    }
-
-    open() {
-        activeDocument = this;
-        console.log('opened ' + this.name);
-        this.sidebarItem.setActive(false);
-        window.history.pushState(document.name, document.title, '/d/' + this.id);
-        this.points.forEach((points, id) => {
-            ctx.beginPath();
-            points.forEach((point) => {
-                if (point.dt === 0) {
-                    ctx.stroke();//todo only do this at the end
-                    ctx.moveTo(point.x, point.y);
-                } else {
-                    ctx.lineTo(point.x, point.y);
-                }
-            })
-            ctx.stroke();
-        });
-        this.addClient(localClient);
-    }
-
-    close() {
-        localClient.update();
-        ctx.clearRect(0, 0, canvas.width, canvas.height);//todo a loading screen?
-        this.clients.forEach((client) => {
-            this.removeClient(client.id);
-        })
-    }
-
-    draw(dt) {
-        this.clients.forEach((client) => {
-            client.draw(dt);
-        })
-    }
-
-    addClient(client) {
-        this.clients.set(client.id, client);
-        clientsToolbar.appendChild(client.icon);
-    }
-
-    removeClient(id) {
-        this.clients.get(id).icon.remove();
-        this.clients.delete(id);
-    }
-}
-
-document.getElementById('add').addEventListener('click', () => {
-    if (activeDocument != null) activeDocument.close();
-    socket.sendCreate();
-});
-
-window.addEventListener('resize', resizeCanvas);
-function resizeCanvas() {
-    let imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
-    let rect = canvas.parentNode.getBoundingClientRect();
-    canvas.width = rect.width;
-    canvas.height = rect.height;
-    ctx.putImageData(imageData, 0, 0);
-    //todo redraw?
-}
-resizeCanvas();
-
-let last = performance.now();
-
-function draw(now) {
-    let dt = (now - last);
-    last = now;
-
-    if (activeDocument != null) {
-        activeDocument.draw(dt);
-    }
-
-    window.requestAnimationFrame(draw);
-}
-window.requestAnimationFrame(draw);
-
-socket.addEventListener('protocol.addclient', (event) => {
-    let client = new Client(event.id, User.getUser(event.userId));
-    activeDocument.addClient(client);
-    console.log('Add client ', client);
-});
-socket.addEventListener('protocol.removeclient', (event) => {
-    console.log('Remove client ', activeDocument.removeClient(event.id));
-});
-socket.addEventListener('protocol.draw', (event) => {
-    let client = activeDocument.clients.get(event.id);
-    console.log(activeDocument.clients, event.id);
-    event.points.forEach((point) => {
-        client.points.push(point);
-    });
-});
-socket.addEventListener('protocol.adddocument', (event) => {
-    documents.set(event.id, new Document(event.name, event.id));
-});
-socket.addEventListener('protocol.opendocument', (event) => {
-    if (activeDocument != null) {
-        activeDocument.close();
-    }
-
-    activeDocument = documents.get(event.document.id);
-    Object.assign(activeDocument, event.document);
-    activeDocument.open();
-
-});
-socket.addEventListener('protocol.handshake', (event) => {
-    window.localStorage.setItem('token', event.token.toString());
-})
-socket.addEventListener('socket.open', () => {
-    let token = window.localStorage.getItem('token');
-    if (token != null) {
-        token = BigInt(window.localStorage.getItem('token'));
-    } else {
-        token = BigInt(0);
-    }
-    socket.sendHandshake(token);
-    let invite = document.location.href.substring(document.location.href.lastIndexOf("/") + 1);
-    if (invite !== '') {
-        socket.sendOpen(invite);
-    }
-});
-
-const localClient = new LocalClient();
\ No newline at end of file
diff --git a/board-web-client/scripts/LocalClient.js b/board-web-client/scripts/LocalClient.js
deleted file mode 100644
index 25b714ef..00000000
--- a/board-web-client/scripts/LocalClient.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import Client from './Client.js'
-import socket from './WebSocketHandler.js'
-import {canvas, ctx} from './Document.js'
-
-const UPDATE_INTERVAL = 1000;
-
-export default class LocalClient extends Client {
-    constructor() {
-        super(-1);
-        this.point = null;
-        this.lastTime = 0;
-        this.lastSend = 0;
-        this.lastDirection = 0;
-        this.lastX = 0;
-        this.lastY = 0;
-        this.refresh = true;
-        this.points = [];
-        canvas.addEventListener('mousedown', (event) => {this.mousedown(event)});
-        canvas.addEventListener('mouseup', (event) => {
-            document.getElementsByTagName('body')[0].classList.remove('noselect');
-            if (this.point !== null) {
-                this.pushPoint();
-                this.point = null;
-            }
-        });
-        canvas.addEventListener('mouseenter', (event) => {this.mousedown(event)});
-        canvas.addEventListener('mousemove', (event) => {
-            if (event.buttons & 1 && this.point !== null) {
-                ctx.beginPath();
-                ctx.moveTo(event.offsetX - event.movementX, event.offsetY - event.movementY);
-                ctx.lineTo(event.offsetX, event.offsetY);
-                ctx.stroke();
-                let now = performance.now();
-                this.point.dt += now - this.lastTime;
-                this.point.x = event.offsetX;
-                this.point.y = event.offsetY;
-                if (this.point.dt > 10 && (Math.abs(Math.atan2(this.point.y - this.lastX, this.point.x - this.lastY) - this.lastDirection) > 0.1 || this.point.dt > UPDATE_INTERVAL)) {
-                    this.pushPoint();
-                    this.point = {
-                        dt:0,
-                        x:this.point.x,
-                        y:this.point.y,
-                    };
-                }
-                this.lastTime = now;
-            }
-        });
-        setInterval(() => this.update(), UPDATE_INTERVAL);
-    }
-
-    draw(dt) {
-        this.lastSend = performance.now();
-        socket.sendDraw(this.points);
-    }
-    
-    update() {
-        this.lastSend = performance.now();
-        socket.sendDraw(this.points);
-    }
-
-    mousedown(event) {
-        document.getElementsByTagName('body')[0].classList.add('noselect');
-        if (event.buttons & 1) {
-            this.lastTime = performance.now();
-            this.points.push({
-                dt:0,
-                x:event.offsetX,
-                y:event.offsetY,
-            })
-            this.point = {
-                dt:this.lastTime - this.lastSend,
-                x:event.offsetX,
-                y:event.offsetY,
-            }
-            this.lastX = event.offsetX;
-            this.lastY = event.offsetY;
-        }
-    }
-
-    pushPoint() {
-        if (this.point.dt !== 0 ||
-            this.point.x !== 0 ||
-            this.point.y !== 0) {
-            this.points.push(this.point);
-            this.lastDirection = Math.atan2(this.point.y, this.point.x);
-        }
-    }
-}
\ No newline at end of file
diff --git a/board-web-client/scripts/User.js b/board-web-client/scripts/User.js
deleted file mode 100644
index 024a8718..00000000
--- a/board-web-client/scripts/User.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import socket from "./WebSocketHandler.js";
-
-const users = new Map();
-let user = null;
-
-export function getUser(id) {
-    if (id == null) {
-        return user;
-    } else {
-        return users.get(id);
-    }
-}
-
-class User {
-    constructor(id) {
-        this.id = id;
-        users.set(id, this);
-    }
-}
-
-socket.addEventListener('protocol.handshake', (event) => {
-    user = new User(event.userId);
-})
-socket.addEventListener('protocol.adduser', (event) => {
-    let user = users.get(event.user.id);
-    if (user == null) {
-        user = new User(event.user.id);
-    }
-    Object.assign(user, event.user);
-});
\ No newline at end of file
diff --git a/board-web-client/scripts/WebSocketHandler.js b/board-web-client/scripts/WebSocketHandler.js
deleted file mode 100644
index 88cde9c1..00000000
--- a/board-web-client/scripts/WebSocketHandler.js
+++ /dev/null
@@ -1,243 +0,0 @@
-class WebSocketHandler {
-    constructor() {
-        this.events = {};
-        [
-            'socket.open',
-            'socket.close',
-            'protocol.addclient',
-            'protocol.adduser',
-            'protocol.removeclient',
-            'protocol.draw',
-            'protocol.opendocument',
-            'protocol.adddocument',
-            'protocol.handshake',
-        ].forEach((type) => {
-            this.events[type] = [];
-        })
-
-        let webSocketUrl;
-        if (window.location.protocol === 'https:') {
-            webSocketUrl = 'wss://localhost/websocket';
-        } else {
-            console.warn('Insecure connection, this better be a development environment');//todo disable/disallow
-            webSocketUrl = 'ws://localhost/websocket';
-        }
-        console.log('Opening WebSocket connection to ' + webSocketUrl);
-        this.socket = new WebSocket(webSocketUrl);
-        this.socket.binaryType = 'arraybuffer';
-
-        this.socket.addEventListener('open', (event) => {
-            console.log('WebSocket connection opened');
-            this.dispatchEvent('socket.open');
-        });
-
-        this.socket.addEventListener('close', (event) => {
-            console.log('WebSocket connection closed');
-            this.dispatchEvent('socket.close');
-        });
-    
-        this.socket.addEventListener('message', (event) => {
-            if (typeof event.data === 'string') {
-                console.log(event.data);
-            } else {
-                let dataView = new DataView(event.data);
-                let offset = 0;
-
-                while (offset < dataView.byteLength) {
-                    let type = dataView.getUint8(offset);
-                    offset += 1;
-                    switch (type) {
-                        case 0: {
-                            let e = {};
-                            e.id = dataView.getInt16(offset);
-                            offset += 2;
-                            e.userId = dataView.getBigInt64(offset);
-                            offset += 8;
-                            this.dispatchEvent('protocol.addclient', e);
-                            break;
-                        }
-                        case 1: {
-                            let e = {};
-                            e.id = dataView.getInt16(offset);
-                            offset += 2;
-                            this.dispatchEvent('protocol.removeclient', e);
-                            break;
-                        }
-                        case 2: {
-                            let e = {};
-                            e.id = dataView.getInt16(offset);
-                            offset += 2;
-                            let size = dataView.getUint16(offset);
-                            offset += 2;
-                            e.points = [];
-                            for (let i = 0; i < size; i++) {
-                                let point = {};
-                                point.dt = dataView.getUint8(offset);
-                                offset += 1;
-                                point.x = dataView.getInt16(offset);
-                                offset += 2;
-                                point.y = dataView.getInt16(offset);
-                                offset += 2;
-                                point.usedDt = 0;
-                                e.points.push(point);
-                            }
-                            this.dispatchEvent('protocol.draw', e);
-                            break;
-                        }
-                        case 3: {
-                            let e = {};
-                            e.document = {};
-                            e.document.id = dataView.getBigInt64(offset);
-                            offset += 8;
-                            e.document.points = new Map();
-                            let length = dataView.getUint16(offset);
-                            offset += 2;
-                            for (let i = 0; i < length; i++) {
-                                let id = dataView.getBigInt64(offset);
-                                offset += 8;
-                                let size = dataView.getUint16(offset);
-                                offset += 2;
-                                let points = [];
-                                for (let i = 0; i < size; i++) {
-                                    let point = {};
-                                    point.dt = dataView.getUint8(offset);
-                                    offset += 1;
-                                    point.x = dataView.getInt16(offset);
-                                    offset += 2;
-                                    point.y = dataView.getInt16(offset);
-                                    offset += 2;
-                                    point.usedDt = 0;
-                                    points.push(point);
-                                }
-                                e.document.points.set(id, points);
-                            }
-                            this.dispatchEvent('protocol.opendocument', e);
-                            break;
-                        }
-                        case 4: {
-                            let e = {};
-                            e.id = dataView.getBigInt64(offset);
-                            offset += 8;
-                            length = dataView.getUint8(offset);
-                            offset += 1;
-                            e.name = new TextDecoder().decode(event.data.slice(offset, offset + length));
-                            offset += length;
-                            this.dispatchEvent('protocol.adddocument', e);
-                            break;
-                        }
-                        case 5: {
-                            let e = {};
-                            e.token = dataView.getBigInt64(offset);
-                            offset += 8;
-                            e.userId = dataView.getBigInt64(offset);
-                            offset += 8;
-                            this.dispatchEvent('protocol.handshake', e);
-                            break;
-                        }
-                        case 6: {
-                            let e = {};
-                            e.user = {};
-                            e.user.id = dataView.getBigInt64(offset);
-                            offset += 8;
-                            this.dispatchEvent('protocol.adduser', e);
-                            break;
-                        }
-                        default:
-                            console.error('unknown payload type ' + type + ', offset ' + offset + ', event ', event);
-                    }
-                }
-            }
-        });
-
-        this.socket.addEventListener('error', (event) => {
-            console.log('socket error', event);
-        });
-    }
-
-    addEventListener(type, onevent) {
-        this.events[type].push(onevent);
-    }
-    
-    dispatchEvent(type, event) {
-        console.log('recv', type, event);
-        this.events[type].forEach(onevent => onevent(event));
-    }
-
-    send(payload) {
-        if (this.socket.readyState === WebSocket.OPEN) {
-            console.log('send', payload);
-            this.socket.send(payload);
-        } else {
-            console.error('tried to send payload while websocket was closed', payload);
-        }
-    }
-
-    sendOpen(id) {
-        let buffer = new ArrayBuffer(1 + 8);
-        let dataView = new DataView(buffer);
-        let offset = 0;
-
-        dataView.setUint8(offset, 0);
-        offset += 1;
-        
-        dataView.setBigInt64(offset, id);
-        offset += 8;
-
-        this.send(buffer);
-    }
-
-    sendCreate() {
-        let buffer = new ArrayBuffer(1);
-        let dataView = new DataView(buffer);
-        let offset = 0;
-
-        dataView.setUint8(offset, 2);
-        offset += 1;
-
-        this.send(buffer);
-    }
-
-    sendDraw(points) {
-        if (points.length === 0) {
-            return;
-        }
-        let buffer = new ArrayBuffer(1 + 1 + points.length * 5);
-        let dataView = new DataView(buffer);
-        let offset = 0;
-
-        dataView.setUint8(offset, 1);
-        offset += 1;
-
-        dataView.setUint8(offset, points.length);
-        offset += 1;
-
-        points.forEach(point => {
-            dataView.setUint8(offset, point.dt);
-            offset += 1;
-            dataView.setInt16(offset, point.x);
-            offset += 2;
-            dataView.setInt16(offset, point.y);
-            offset += 2;
-        });
-
-        points.length = 0;//clear
-
-        this.send(buffer);
-    }
-
-    sendHandshake(token) {
-        let buffer = new ArrayBuffer(9);
-        let dataView = new DataView(buffer);
-        let offset = 0;
-
-        dataView.setUint8(offset, 3);
-        offset += 1;
-
-        console.log(token);
-        dataView.setBigInt64(offset, token);
-        offset += 8;
-
-        this.send(buffer);
-    }
-}
-export default new WebSocketHandler();
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..27d8402c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,29 @@
+services:
+    board-room:
+        image: board-room:0.3
+        build:
+            context: board-room
+            network: host
+        ports:
+            - "8080:8080"
+        depends_on:
+            - board-database
+        environment:
+            board.ssl: "false"
+            board.postgres: "true"
+            board.postgres.url: "jdbc:postgresql://board-database:5432/board"
+            board.postgres.user: "board-room"
+            board.postgres.password: "changeme"
+    board-frontend:
+        image: board-frontend
+        build:
+            context: board-frontend
+        ports:
+            - "80:80"
+    board-database:
+        build:
+            context: board-database
+        environment:
+            POSTGRES_PASSWORD: "changeme"
+        ports:
+            - "5432:5432"
\ No newline at end of file