diff --git a/app/js/dataaccess.js b/app/js/dataaccess.js
index 83310a5..b2dcb0c 100644
--- a/app/js/dataaccess.js
+++ b/app/js/dataaccess.js
@@ -388,7 +388,6 @@ module.exports = (function () {
         for (var i = 0; i < fileEndings.length; i++) {
             fileEnding = fileEndings[i];
             var path = pathModule.join(defaultTokenPath, creatureId + fileEnding);
-            console.log(path);
             if (fs.existsSync(path)) return path;
         }
         return null;
diff --git a/app/js/database.js b/app/js/database.js
index fa5ad7b..b703768 100644
--- a/app/js/database.js
+++ b/app/js/database.js
@@ -1206,13 +1206,11 @@ function loadAll() {
 }
 
 function listAll() {
-    console.log("List all");
     if (listedData == null) {
         listedData = loadedData;
     }
 
     var data = listedData;
-    console.log(data);
     var tabElementName = tab == "homebrew" ? "monsters" : tab;
     if (sortFunction != null) {
         data.sort(sortFunction);
diff --git a/app/js/util.js b/app/js/util.js
index 3373a08..4800312 100644
--- a/app/js/util.js
+++ b/app/js/util.js
@@ -347,8 +347,9 @@ module.exports = (function () {
     }
 
     function fadeOut(ele, ms = 2000) {
+        if (!ele.parentNode) return;
         ele.classList.add("fade_out");
-        ele.style.animationDuration = `${ms/1000}s`;
+        ele.style.animationDuration = `${ms / 1000}s`;
         window.setTimeout(function (evt) {
             if (ele.parentNode) ele.parentNode.removeChild(ele);
         }, ms);
diff --git a/app/mappingTool.html b/app/mappingTool.html
index 7f74ed0..d3f9c70 100644
--- a/app/mappingTool.html
+++ b/app/mappingTool.html
@@ -680,13 +680,13 @@ <h2 class="interactive_header">Sound</h2>
             <script src="mappingTool/previewPlacing.js"></script>
             <!-- <script src="mappingTool/map.js"></script> -->
             <script src="../docs/client/map.js"></script>
-       
+
             <script src="mappingTool/mapscript.ipc.js"></script>
             <script src="../docs/client/measurements.js"></script>
-
+            <script src="../docs/client/pawns.js"></script>
             <script src="../docs/client/timer.js"></script>
             <script src="../docs/client/lightning.js"></script>
-                 <script src="mappingTool/map.admin.js"></script>
+            <script src="mappingTool/map.admin.js"></script>
             <script src="mappingTool/spectrum.js"></script>
             <script src="mappingTool/howler/howler.core.min.js"></script>
             <script src="mappingTool/howler/howler.spatial.min.js"></script>
diff --git a/app/mappingTool/map.admin.js b/app/mappingTool/map.admin.js
index 2b349f7..fee4806 100644
--- a/app/mappingTool/map.admin.js
+++ b/app/mappingTool/map.admin.js
@@ -681,18 +681,16 @@ async function getDefaultLibraryTokenPaths(pawn) {
 function killOrRevivePawn() {
     var btn = document.getElementById("kill_or_revive_button");
     var revivePawn = btn.innerHTML == "Revive";
+
     for (var i = 0; i < selectedPawns.length; i++) {
         killOrReviveHelper(selectedPawns[i]);
     }
-    refreshPawnToolTips();
 
     function killOrReviveHelper(pawnElement) {
-        var isPlayer = isPlayerPawn(pawnElement);
-
         if (revivePawn) {
-            if (pawnElement.dead == "false") return;
-            pawnElement.dead = "false";
-            if (!isPlayer) {
+            if (!pawnManager.isDead(pawnElement)) return;
+            pawnManager.revive(pawnElement);
+            if (!isPlayerPawn(pawnElement)) {
                 if (pawnElement.index_in_main_window) {
                     window.api.messageWindow("mainWindow", "monster-revived", {
                         name: pawnElement.dnd_name,
@@ -701,9 +699,9 @@ function killOrRevivePawn() {
                 }
             }
         } else {
-            if (pawnElement.dead == "true") return;
-            pawnElement.dead = "true";
-            if (!isPlayer) {
+            if (pawnManager.isDead(pawnElement)) return;
+            pawnManager.kill(pawnElement);
+            if (!isPlayerPawn(pawnElement)) {
                 if (pawnElement.index_in_main_window) {
                     window.api.messageWindow("mainWindow", "monster-killed", [pawnElement.dnd_name, pawnElement.index_in_main_window]);
                 }
@@ -711,7 +709,6 @@ function killOrRevivePawn() {
         }
         var arg = { dead: !revivePawn, elementId: pawnElement.id };
         serverNotifier.notifyServer("monster-health-changed", arg);
-        pawnElement.setAttribute("data-state_changed", 1);
     }
 }
 
@@ -798,7 +795,7 @@ function setScaleIfSaved(pawn, path) {
     if (!path) return;
     var scale = localStorage.getItem(`token_scale${path}`);
     if (scale) {
-        map.setTokenScale(pawn, scale);
+        pawnManager.setScale(pawn, scale);
     } else {
         //Check if file name contains _ScaleXX_,
         var found = path.toLowerCase().match(/_scale.+_/g);
@@ -807,10 +804,10 @@ function setScaleIfSaved(pawn, path) {
             number = parseInt(number);
             var fileScale = number / 100;
             if (fileScale > 0 && fileScale < 10) {
-                map.setTokenScale(pawn, fileScale);
+                pawnManager.setScale(pawn, fileScale);
             }
         } else {
-            map.setTokenScale(pawn, 1);
+            pawnManager.setScale(pawn, 1);
         }
     }
 }
@@ -846,11 +843,11 @@ async function setTokenImageHandler(e) {
 }
 
 function showPopupMenuPawn(x, y) {
+    if (!selectedPawns[0]) return;
     document.getElementById("popup_menu_general").classList.add("hidden");
-
     var popup = document.getElementById("popup_menu_pawn");
     var killButton = document.getElementById("kill_or_revive_button");
-    if (selectedPawns[0].dead == "true") {
+    if (pawnManager.isDead(selectedPawns[0])) {
         killButton.innerHTML = "Revive";
     } else {
         killButton.innerHTML = "Kill";
diff --git a/app/mappingTool/map.css b/app/mappingTool/map.css
index 02275d6..6d4f3ef 100644
--- a/app/mappingTool/map.css
+++ b/app/mappingTool/map.css
@@ -470,7 +470,7 @@ li {
     height: 100%;
 }
 
-.pawn_dead {
+.pawn[data-token-dead=true] {
     background-color: rgba(218, 0, 0, 0.632) !important;
     background-image: url("tokens/dead.png");
 }
diff --git a/app/mappingTool/mapscript.ipc.js b/app/mappingTool/mapscript.ipc.js
index 8735901..fc57fe5 100644
--- a/app/mappingTool/mapscript.ipc.js
+++ b/app/mappingTool/mapscript.ipc.js
@@ -112,7 +112,7 @@ ipcRenderer.on("client-event", function (evt, arg) {
         
         map.moveObject(pawn, tanslatedPixels, false)
     }else if (arg.event == "talk-bubble"){
-        map.talkBubble(arg);
+        pawnManager.talkBubble(arg);
     }
 })
 ipcRenderer.on("notify-map-tool-monsters-loaded", function (evt, arg) {
diff --git a/app/mappingTool/menu.js b/app/mappingTool/menu.js
index a368a1f..ae5feb2 100644
--- a/app/mappingTool/menu.js
+++ b/app/mappingTool/menu.js
@@ -81,7 +81,7 @@ class Menu {
     document.getElementById("token_scale_button").onclick = (e) => {
       var firstPawn = selectedPawns[0];
       var initValue =
-        selectedPawns.length == 1 ? map.getTokenScale(firstPawn) : 1;
+        selectedPawns.length == 1 ? pawnManager.getScale(firstPawn) : 1;
 
       Modals.minifiedPrompt(
         { clientX: firstPawn.offsetLeft, clientY: firstPawn.offsetTop },
@@ -95,7 +95,7 @@ class Menu {
         (scale) => {
           if (!scale) return;
           selectedPawns.forEach((pawn) => {
-            map.setTokenScale(pawn, scale);
+            pawnManager.setScale(pawn, scale);
           });
         }
       );
diff --git a/app/mappingTool/previewPlacing.js b/app/mappingTool/previewPlacing.js
index 37c4864..80164ba 100644
--- a/app/mappingTool/previewPlacing.js
+++ b/app/mappingTool/previewPlacing.js
@@ -37,7 +37,7 @@ const previewPlacementManager = (function () {
             if (ts == dragPreviewTimestamp) {
                 return;
             }
-
+            if (!previewPlacementElement) return;
             dragPreviewTimestamp = ts;
             e.preventDefault();
             var elementHeight = parseFloat(previewPlacementElement.style.height);
diff --git a/app/mappingTool/saveManager.js b/app/mappingTool/saveManager.js
index 02c1a93..42a8750 100644
--- a/app/mappingTool/saveManager.js
+++ b/app/mappingTool/saveManager.js
@@ -261,7 +261,7 @@ class SaveManager {
     }
 
     async exportMobTokens(pawn) {
-        var allTokens = [...pawn.querySelectorAll(".mob_token")].filter(x=> !x.classList.contains("mob_token_dead"));
+        var allTokens = [...pawn.querySelectorAll(".mob_token")].filter((x) => !x.classList.contains("mob_token_dead"));
         var tokenPaths = allTokens.map((ele) => ele.getAttribute("data-token_path"));
 
         var distinctTokens = [...new Set(tokenPaths)];
@@ -294,12 +294,13 @@ class SaveManager {
         var darkVisionRadius = element.sight_mode == "darkvision" ? element.sight_radius_bright_light : null;
         var currentPath = img ? images[currentIndex] || DEFAULT_TOKEN_PATH_JS_RELATIVE : null;
         var base64 = currentPath ? await util.toBase64(currentPath) : null;
-        var scale = map.getTokenScale(pawn[0]);
+        var scale = pawnManager.getScale(pawn[0]);
+        console.log(pawnManager.isDead(pawn[0]));
         return {
             name: pawn[1],
             id: element.id,
             isPlayer: isPlayerPawn(pawn[0]),
-            dead: element.dead,
+            dead: pawnManager.isDead(element) + "",
             isMob: isMob,
             mobSize: mobSize,
             mobCountDead: 0,
@@ -308,7 +309,6 @@ class SaveManager {
             hexes: element.dnd_hexes,
             color: element.style.backgroundColor,
             health_percentage: element.data_health_percentage || "100",
-            dead: element.dead,
             scale: scale,
             size: element.dnd_size,
             flying_height: element.flying_height,
@@ -319,7 +319,6 @@ class SaveManager {
             bgPhotoBase64: base64,
             pos: map.objectGridCoords(element),
             darkVisionRadius: darkVisionRadius,
-            //attached_objects : element.attached_objects
         };
     }
 
diff --git a/app/mappingTool/serverNotifier.js b/app/mappingTool/serverNotifier.js
index f9a1cd3..83cae56 100644
--- a/app/mappingTool/serverNotifier.js
+++ b/app/mappingTool/serverNotifier.js
@@ -1,6 +1,4 @@
-
-
-var serverNotifier = function () {
+var serverNotifier = (function () {
     var timeouts = {};
 
     async function mapToolInit() {
@@ -9,18 +7,17 @@ var serverNotifier = function () {
         notifyServer("segments", []);
         notifyServer("initiative", initiative.getState());
     }
-    
-    async function sendState() {
 
+    async function sendState() {
         var bgState = {};
-        backgroundLoop.saveSlideState(bgState)
+        backgroundLoop.saveSlideState(bgState);
         var overlayState = {};
         overlayLoop.saveSlideState(overlayState);
 
-
         ipcRenderer.send("maptool-server-event", {
-            event: "maptool-state", data: {
-                tokens: (await getTokensForExport(false)),
+            event: "maptool-state",
+            data: {
+                tokens: await getTokensForExport(false),
                 backgroundLoop: bgState,
                 overlayLoop: overlayState,
                 foreground: getForegroundState(),
@@ -31,21 +28,19 @@ var serverNotifier = function () {
                 fog: fovLighting.getFogStyle(),
                 conditions: await getConditionsForExport(),
                 roundTimer: roundTimer?.getState(),
-                initiative: initiative.getState()
-            }
+                initiative: initiative.getState(),
+            },
         });
-
     }
 
-
     function getSegments() {
         var segments = fovLighting.getSegments();
-        return segments.map(seg => {
+        return segments.map((seg) => {
             return {
                 a: map.toGridCoords(seg.a.x, seg.a.y),
-                b: map.toGridCoords(seg.b.x, seg.b.y)
-            }
-        })
+                b: map.toGridCoords(seg.b.x, seg.b.y),
+            };
+        });
     }
 
     function isServer() {
@@ -54,7 +49,7 @@ var serverNotifier = function () {
 
     function getBackgroundState() {
         var hw = getCanvasState(backgroundCanvas);
-        return { path: settings.currentBackground, width: hw.width, height: hw.height }
+        return { path: settings.currentBackground, width: hw.width, height: hw.height };
     }
 
     function getMapEdgeState() {
@@ -63,20 +58,18 @@ var serverNotifier = function () {
 
     function getForegroundState() {
         var hw = getCanvasState(foregroundCanvas);
-        return { path: settings.currentMap, width: hw.width, height: hw.height, translate: { x: foregroundCanvas.data_transform_x || 0, y: foregroundCanvas.data_transform_y || 0 } }
+        return { path: settings.currentMap, width: hw.width, height: hw.height, translate: { x: foregroundCanvas.data_transform_x || 0, y: foregroundCanvas.data_transform_y || 0 } };
     }
 
-
     function getOverlayState() {
         var hw = getCanvasState(overlayCanvas);
-        return { path: settings.currentOverlay, width: hw.width, height: hw.height }
+        return { path: settings.currentOverlay, width: hw.width, height: hw.height };
     }
 
     function getCanvasState(canvas) {
         return { height: parseFloat(canvas.style.height), width: parseFloat(canvas.style.width) };
     }
 
-
     async function serverTokensChanged() {
         var tokens = await getTokensForExport();
         ipcRenderer.send("maptool-server-event", { event: "tokens", data: tokens });
@@ -90,24 +83,21 @@ var serverNotifier = function () {
         return effectArr;
     }
 
-
     async function getTokensForExport(includeHidden) {
         var tokens = [];
         for (var i = 0; i < pawns.monsters.length; i++) {
-            if (!includeHidden && pawns.monsters[i][0].client_hidden)
-                continue;
-            tokens.push(await saveManager.exportPawn(pawns.monsters[i]))
+            if (!includeHidden && pawns.monsters[i][0].client_hidden) continue;
+            tokens.push(await saveManager.exportPawn(pawns.monsters[i]));
         }
         for (var i = 0; i < pawns.players.length; i++) {
-            if (!includeHidden && pawns.players[i][0].client_hidden)
-                continue;
-            tokens.push(await saveManager.exportPawn(pawns.players[i], includeHidden))
+            if (!includeHidden && pawns.players[i][0].client_hidden) continue;
+            tokens.push(await saveManager.exportPawn(pawns.players[i], includeHidden));
         }
+        console.log(tokens);
 
         return tokens;
     }
 
-
     function notifyServer(eventName, data) {
         ipcRenderer.send("maptool-server-event", { event: eventName, data: data });
     }
@@ -119,12 +109,10 @@ var serverNotifier = function () {
             delete exportList[i].condition_background_location;
         }
         return exportList;
-
     }
 
     async function mobTokensChanged(mobElement) {
-        notifyServer("mob-tokens-set", await saveManager.exportMobTokens(mobElement))
-
+        notifyServer("mob-tokens-set", await saveManager.exportMobTokens(mobElement));
     }
 
     function serverIsRunning() {
@@ -139,13 +127,14 @@ var serverNotifier = function () {
         getForegroundState: getForegroundState,
         getTokensForExport: getTokensForExport,
         getBackgroundState: getBackgroundState,
-        getMapEdgeState, getMapEdgeState,
+        getMapEdgeState,
+        getMapEdgeState,
         getOverlayState: getOverlayState,
         serverTokensChanged: serverTokensChanged,
         mobTokensChanged: mobTokensChanged,
         isServer: isServer,
         getSegments: getSegments,
         getEffectsForExport: getEffectsForExport,
-        timeouts: timeouts
-    }
-}();
+        timeouts: timeouts,
+    };
+})();
diff --git a/app/mappingTool/tokenDialog.js b/app/mappingTool/tokenDialog.js
index d5ac19b..1e3aaa0 100644
--- a/app/mappingTool/tokenDialog.js
+++ b/app/mappingTool/tokenDialog.js
@@ -164,6 +164,12 @@ class TokenDialog {
         var cls = this;
         this.onPlacementInfoChanged();
         sidebarManager.showInSideBar(this.dialog, () => {
+            this.dialog.classList.add("hidden");
+            pauseAlternativeKeyboardMoveMap = false;
+            resetGridLayer();
+            gridLayer.style.cursor = "auto";
+            if (this.stopTooltip) this.stopTooltip();
+            previewPlacementManager.clear();
             document.body.appendChild(cls.dialog);
         });
 
@@ -206,13 +212,7 @@ class TokenDialog {
     }
 
     close() {
-        this.dialog.classList.add("hidden");
         sidebarManager.close();
-        pauseAlternativeKeyboardMoveMap = false;
-        resetGridLayer();
-        gridLayer.style.cursor = "auto";
-        if (this.stopTooltip) this.stopTooltip();
-        previewPlacementManager.clear();
     }
 
     async addPawnHandler(e) {
diff --git a/app/server/server.js b/app/server/server.js
index 147ff6a..24287df 100644
--- a/app/server/server.js
+++ b/app/server/server.js
@@ -382,7 +382,7 @@ function sendMaptoolState(maptoolState) {
             sendBatched(peer.connection, "map_edge", dataObject.mapEdge?.data, {
                 format: dataObject.mapEdge?.format,
             });
-            console.log(dataObject.background);
+         
             sendBatched(peer.connection, "background", dataObject.background?.data, {
                 width: maptoolState.background?.width,
                 height: maptoolState.background?.height,
diff --git a/docs/client.html b/docs/client.html
index 4e66be8..dcd48f1 100644
--- a/docs/client.html
+++ b/docs/client.html
@@ -1,173 +1,190 @@
 <head>
     <title>Virtual tabletop | Dungeoneer</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="author" content="Durtur">
-    <meta name="description" content="Dungeoneer is a modern, open sourced and performmant dungeon master helper tool">
-    <meta property="og:title" content="Dungeoneer D&D tool">
-    <meta property="og:description"
-        content="Dungeoneer is a modern, open sourced and performmant dungeon master helper tool, includes generators, a battlemap (VTT), combat trackers and more.">
-    <meta property="og:image" content="./img/ogimg.JPG">
-
-    <meta property="og:site_name" content="Dungeoneer D&D Tool">
-    <meta name="twitter:card" content="./img/ogimg.JPG">
-    <meta name="twitter:image:alt" content="Dungeoneer tool">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Open+Sans&family=Roboto&display=swap" rel="stylesheet">
-    <link rel="icon" type="image/svg+xml" href="./icon.png">
-    <link href="style.css" rel="stylesheet">
-    <link href="client.css" rel="stylesheet">
-    <link href="common.css" rel="stylesheet">
-    <link href="css/theme.css" rel="stylesheet">
-    <link href="css/modals.css" rel="stylesheet">
-    <link href="css/map.css" rel="stylesheet">
-    <link href="css/effects.css" rel="stylesheet">
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="author" content="Durtur" />
+    <meta name="description" content="Dungeoneer is a modern, open sourced and performmant dungeon master helper tool" />
+    <meta property="og:title" content="Dungeoneer D&D tool" />
+    <meta property="og:description" content="Dungeoneer is a modern, open sourced and performmant dungeon master helper tool, includes generators, a battlemap (VTT), combat trackers and more." />
+    <meta property="og:image" content="./img/ogimg.JPG" />
+
+    <meta property="og:site_name" content="Dungeoneer D&D Tool" />
+    <meta name="twitter:card" content="./img/ogimg.JPG" />
+    <meta name="twitter:image:alt" content="Dungeoneer tool" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans&family=Roboto&display=swap" rel="stylesheet" />
+    <link rel="icon" type="image/svg+xml" href="./icon.png" />
+    <link href="style.css" rel="stylesheet" />
+    <link href="client.css" rel="stylesheet" />
+    <link href="common.css" rel="stylesheet" />
+    <link href="css/theme.css" rel="stylesheet" />
+    <link href="css/modals.css" rel="stylesheet" />
+    <link href="css/map.css" rel="stylesheet" />
+    <link href="css/effects.css" rel="stylesheet" />
 </head>
 
-
 <html>
-
-<body>
-    <p id = "initiative_current_actor" class = "hidden initiative_current_actor" >
-
-    </p>
-    <div class = "loading_ele_cont nobackground hidden" id = "loading" >
-        <div id="loading_ele" class="loading_ele" alt="loading" class="center">
-            <img src="css/img/loading.gif"  alt="loading"
-                class="center">
-        </div>
-        <div class="column" style="margin-top:2em">
-            <p id="loading_title">Connecting...</p>
-          
+    <body>
+        <p id="initiative_current_actor" class="hidden initiative_current_actor"></p>
+        <div class="loading_ele_cont nobackground hidden" id="loading">
+            <div id="loading_ele" class="loading_ele" alt="loading" class="center">
+                <img src="css/img/loading.gif" alt="loading" class="center" />
+            </div>
+            <div class="column" style="margin-top: 2em">
+                <p id="loading_title">Connecting...</p>
+            </div>
         </div>
-    </div>
-
- 
-    <main id = "map_main">
-        <div class="toolbar column" >
-            <button class = "hamburger button_style togglable"  onclick = "menu.toggleToolbar(this, event)"></button>
-            <div id="connection_status"></div>
-            <select title="Sight origin" id="fov_perspective_dropdown" onchange="onPerspectiveChanged()">
 
-                <option value="players">Players</option>
-            </select>
-            <div class = "column" id = "dice-roller"></div>
-            <div class="tool_container column space_between">
-             
-                <div class="column  "  id="toolbar">
-
-                    <button title="Line measurement tool" class="toggle_button button_style toolbox_button"
-                        id="line_tool" style="background-image: url(css/line.png);" toggleGroup="1" toggled="false"
-                        onclick="setTool(event, this,0)"></button>
-                    <button title="Cone measurement tool" class="toggle_button button_style toolbox_button"
-                        id="cone_tool" style="background-image: url(css/cone.png);" toggleGroup="1" toggled="false"
-                        onclick="setTool(event, this,1)"></button>
-                    <button title="Sphere measurement tool" class="toggle_button button_style toolbox_button"
-                        id="sphere_tool" style="background-image: url(css/sphere.png);" toggleGroup="1" toggled="false"
-                        onclick="setTool(event, this,2)"></button>
-                    <button title="Cube measurement tool" class="toggle_button button_style toolbox_button"
-                        id="cube_tool" style="background-image: url(css/cube.png);" toggleGroup="1" toggled="false"
-                        onclick="setTool(event, this,3)"></button>
-                    <button title="Rectangle measurement tool" class="toggle_button button_style toolbox_button"
-                        id="rect_tool" style="background-image: url(css/rect.png);" toggleGroup="1" toggled="false"
-                        onclick="setTool(event, this,4)"></button>
+        <main id="map_main">
+            <div class="toolbar column">
+                <button class="hamburger button_style togglable" onclick="menu.toggleToolbar(this, event)"></button>
+                <div id="connection_status"></div>
+                <select title="Sight origin" id="fov_perspective_dropdown" onchange="onPerspectiveChanged()">
+                    <option value="players">Players</option>
+                </select>
+                <div class="column" id="dice-roller"></div>
+                <div class="tool_container column space_between">
+                    <div class="column" id="toolbar">
+                        <button
+                            title="Line measurement tool"
+                            class="toggle_button button_style toolbox_button"
+                            id="line_tool"
+                            style="background-image: url(css/line.png)"
+                            toggleGroup="1"
+                            toggled="false"
+                            onclick="setTool(event, this,0)"
+                        ></button>
+                        <button
+                            title="Cone measurement tool"
+                            class="toggle_button button_style toolbox_button"
+                            id="cone_tool"
+                            style="background-image: url(css/cone.png)"
+                            toggleGroup="1"
+                            toggled="false"
+                            onclick="setTool(event, this,1)"
+                        ></button>
+                        <button
+                            title="Sphere measurement tool"
+                            class="toggle_button button_style toolbox_button"
+                            id="sphere_tool"
+                            style="background-image: url(css/sphere.png)"
+                            toggleGroup="1"
+                            toggled="false"
+                            onclick="setTool(event, this,2)"
+                        ></button>
+                        <button
+                            title="Cube measurement tool"
+                            class="toggle_button button_style toolbox_button"
+                            id="cube_tool"
+                            style="background-image: url(css/cube.png)"
+                            toggleGroup="1"
+                            toggled="false"
+                            onclick="setTool(event, this,3)"
+                        ></button>
+                        <button
+                            title="Rectangle measurement tool"
+                            class="toggle_button button_style toolbox_button"
+                            id="rect_tool"
+                            style="background-image: url(css/rect.png)"
+                            toggleGroup="1"
+                            toggled="false"
+                            onclick="setTool(event, this,4)"
+                        ></button>
+                    </div>
+                    <div class="column">
+                        <button
+                            title="Toggle grid"
+                            class="togglable button_style"
+                            id="toggle_grid_button"
+                            style="background-image: url(css/grid.png); background-size: 60%; background-position: center"
+                            toggled="true"
+                            onclick="toggleGrid()"
+                        ></button>
+                    </div>
+                    <div class="column">
+                        <button
+                            title="Center view on player"
+                            class="button_style"
+                            style="background-image: url(./img/compass.svg); background-size: 60%; background-position: center"
+                            onclick="centerCurrentViewer()"
+                        ></button>
+                    </div>
                 </div>
-                <div class="column">
-                    <button title="Toggle grid" class="togglable button_style " id="toggle_grid_button" style="background-image: url(css/grid.png);
-                    background-size: 60%;
-                    background-position: center;" toggled="true" onclick="toggleGrid()"></button>
+            </div>
+            <div id="connect_container" class="column">
+                <p class="error_text" id="error_message"></p>
+                <div class="row relative">
+                    <label class="input_label">Name</label>
+                    <input id="user_name_input" placeholder="Name" class="padding input_labeled" />
                 </div>
-                <div class="column">
-                    <button title="Center view on player" class=" button_style "  style="background-image: url(./img/compass.svg);
-                    background-size: 60%;
-                    background-position: center;"onclick="centerCurrentViewer()"></button>
+                <div class="row relative">
+                    <label class="input_label">Host ID</label>
+                    <input id="host_id_input" placeholder="Host ID" class="padding input_labeled" />
+                </div>
+                <div class="row relative">
+                    <label class="input_label">Password</label>
+                    <input id="password_input" placeholder="Password" type="password" class="padding input_labeled" />
                 </div>
-            </div>
-        </div>
-        <div id="connect_container" class="column">
-            <p class="error_text" id="error_message"></p>
-            <div class = "row relative">
-                <label class = "input_label">Name</label>
-                <input id="user_name_input" placeholder="Name" class="padding input_labeled">
-            </div>
-            <div class = "row relative">
-                <label class = "input_label">Host ID</label>
-                <input id="host_id_input" placeholder="Host ID" class="padding input_labeled">
-            </div>
-            <div class = "row relative">
-                <label class = "input_label">Password</label>
-                <input id="password_input" placeholder="Password" type="password" class="padding input_labeled">
-            </div>
-        
-            <button class="button_style  green  center hidden" id="connect_button"
-                style="margin-top:2em">Connect</button>
-
-        </div>
-        <div class="initiative" id="initBar">
-            <div class="initiativeNode  init--PC">
-                <p class="initiative_name_node"></p>
-            </div>
-        </div>
-        <div class="canvas_wrapper">
-            <div class="maptool_body"></div>
-            <div id="map_layer_container">
-                <canvas id="background" class="canvas_layer"></canvas>
-                <canvas id="foreground" class="canvas_layer"></canvas>
 
+                <button class="button_style green center hidden" id="connect_button" style="margin-top: 2em">Connect</button>
             </div>
-
-            <canvas id="effects" class="canvas_layer"></canvas>
-            <div id="tokens" class="canvas_layer"></div>
-            <div id="overlay_layer_container">
-                <canvas id="overlay" class="canvas_layer"></canvas>
+            <div class="initiative" id="initBar">
+                <div class="initiativeNode init--PC">
+                    <p class="initiative_name_node"></p>
+                </div>
             </div>
-            <canvas id="fog_of_war" class="canvas_layer" width="100%" height="100%"></canvas>
-            <canvas id="fog_of_war_segments" class="canvas_layer" width="100%" height="100%"></canvas>
-            <canvas id="grid" class="canvas_layer" width="100%" height="100%"></canvas>
-
-            <canvas id="measurements" class="canvas_layer" width="100%" height="100%"></canvas>
-
-        </div>
-        <p id="tooltip" class="tooltip hidden">
-            A tooltip
-        </p>
+            <div class="canvas_wrapper">
+                <div class="maptool_body"></div>
+                <div id="map_layer_container">
+                    <canvas id="background" class="canvas_layer"></canvas>
+                    <canvas id="foreground" class="canvas_layer"></canvas>
+                </div>
 
-        <p id="tooltip2" class="tooltip hidden">
-            A tooltip
-        </p>
-        <div class="initiative hidden" id="initBar">
-            <div class="initiativeNode init_not_started init--PC">
-                <p class="initiative_name_node"></p>
+                <canvas id="effects" class="canvas_layer"></canvas>
+                <div id="tokens" class="canvas_layer"></div>
+                <div id="overlay_layer_container">
+                    <canvas id="overlay" class="canvas_layer"></canvas>
+                </div>
+                <canvas id="fog_of_war" class="canvas_layer" width="100%" height="100%"></canvas>
+                <canvas id="fog_of_war_segments" class="canvas_layer" width="100%" height="100%"></canvas>
+                <canvas id="grid" class="canvas_layer" width="100%" height="100%"></canvas>
 
+                <canvas id="measurements" class="canvas_layer" width="100%" height="100%"></canvas>
             </div>
-        </div>
-    </main>
+            <p id="tooltip" class="tooltip hidden">A tooltip</p>
 
-</body>
-<script src="client/connectionConfig.js"></script>
-<script src="https://unpkg.com/peerjs@1.3.2/dist/peerjs.min.js"></script>
-<script src="client/hammer.min.js"></script>
-<script src="client/client.menus.js"></script>
-<script src="client/client.diceRoller.js"></script>
-<script src="client/map.js"></script>
-<script src="client/map.client.js"></script>
-<script src="client/serverNotifier.client.js"></script>
-<script src="client/initiative.client.js"></script>
-<script src="client/timer.js"></script>
-
-<script src="client/util.client.js"></script>
-<script src="client/modals.client.js"></script>
-<script src="client/lightning.js"></script>
-<script src="client/measurements.js"></script>
-<script src="client/geometry.js"></script>
-<script src="client/slideCanvas.js"></script>
-<script src="client/effectManager.client.js"></script>
-<script src="client/client.js"></script>
-<script src="client/timeout.js"></script>
-<script src="client/controls.js"></script>
-<script src="client/soundManager.client.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.spatial.min.js"></script>
-
-</html>
\ No newline at end of file
+            <p id="tooltip2" class="tooltip hidden">A tooltip</p>
+            <div class="initiative hidden" id="initBar">
+                <div class="initiativeNode init_not_started init--PC">
+                    <p class="initiative_name_node"></p>
+                </div>
+            </div>
+        </main>
+    </body>
+    <script src="client/connectionConfig.js"></script>
+    <script src="https://unpkg.com/peerjs@1.3.2/dist/peerjs.min.js"></script>
+    <script src="client/hammer.min.js"></script>
+    <script src="client/client.menus.js"></script>
+    <script src="client/client.diceRoller.js"></script>
+    <script src="client/map.js"></script>
+    <script src="client/map.client.js"></script>
+    <script src="client/pawns.js"></script>
+    <script src="client/serverNotifier.client.js"></script>
+    <script src="client/initiative.client.js"></script>
+    <script src="client/timer.js"></script>
+
+    <script src="client/util.client.js"></script>
+    <script src="client/modals.client.js"></script>
+    <script src="client/lightning.js"></script>
+    <script src="client/measurements.js"></script>
+    <script src="client/geometry.js"></script>
+    <script src="client/slideCanvas.js"></script>
+    <script src="client/effectManager.client.js"></script>
+    <script src="client/client.js"></script>
+    <script src="client/timeout.js"></script>
+    <script src="client/controls.js"></script>
+    <script src="client/soundManager.client.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.spatial.min.js"></script>
+</html>
diff --git a/docs/client/client.js b/docs/client/client.js
index e3c8961..d8f927e 100644
--- a/docs/client/client.js
+++ b/docs/client/client.js
@@ -308,7 +308,7 @@ function setState(message) {
         case "token-scale":
             var token = pawns.players.find((x) => x[0].id == message.data.id) || pawns.monsters.find((x) => x[0].id == message.data.id);
             if (!token || !token[0]) return;
-            map.setTokenScale(token[0], message.data.scale);
+            pawnManager.setScale(token[0], message.data.scale);
             break;
         case "token-size":
             var token = pawns.players.find((x) => x[0].id == message.data.id) || pawns.monsters.find((x) => x[0].id == message.data.id);
@@ -327,7 +327,7 @@ function setState(message) {
             var token = pawns.players.find((x) => x[0].id == message.data.id) || pawns.monsters.find((x) => x[0].id == message.data.id);
             if (!token || !token[0]) return;
 
-            map.setPawnRotation(token[0], deg);
+            pawnManager.setPawnRotation(token[0], deg);
             break;
         case "token-flying-height":
             var token = pawns.players.find((x) => x[0].id == message.data.id) || pawns.monsters.find((x) => x[0].id == message.data.id);
@@ -477,9 +477,10 @@ async function addPawn(pawn) {
         if (pawn.mobTokens) setMobTokens(pawn.mobTokens);
     };
     pawn.spawnPoint = map.pixelsFromGridCoords(pawn.pos.x, pawn.pos.y);
+    console.log(pawn.dead)
     if (!pawn.isPlayer) pawn.name = "???";
     await generatePawns([pawn], !pawn.isPlayer);
-
+    
     onMonsterHealthChanged({
         dead: pawn.dead == "true",
         healthPercentage: pawn.health_percentage,
diff --git a/docs/client/map.js b/docs/client/map.js
index d207e14..1eeec5d 100644
--- a/docs/client/map.js
+++ b/docs/client/map.js
@@ -258,9 +258,9 @@ function onMonsterHealthChanged(arg) {
     }
 
     if (arg.dead) {
-        pawn.dead = "true";
+        pawnManager.kill(pawn);
     } else {
-        pawn.dead = "false";
+        pawnManager.revive(pawn);
     }
     pawn.setAttribute("data-state_changed", 1);
     refreshPawnToolTips();
@@ -1352,9 +1352,9 @@ function addPawnListeners() {
         pawn.onwheel = function (event) {
             if (event.shiftKey) {
                 if (event.deltaY > 0) {
-                    map.rotatePawn(event.target, 3);
+                    pawnManager.rotatePawn(event.target, 3);
                 } else {
-                    map.rotatePawn(event.target, -3);
+                    pawnManager.rotatePawn(event.target, -3);
                 }
             } else if (event.ctrlKey) {
                 setFlyingHeight(event.target, event.target.flying_height + (event.deltaY > 0 ? 5 : -5), event);
@@ -1620,7 +1620,7 @@ async function createPawnElement(pawn, rotate) {
     newPawn.dnd_name = pawn.name.substring(0, 1).toUpperCase() + pawn.name.substring(1);
     setBasePawnProperties(newPawn, pawn);
     newPawn.style.backgroundColor = settings.colorTokenBases ? pawn.color : "transparent";
-    newPawn.dead = pawn.dead || "false";
+    if (pawn.dead == "true") pawnManager.kill(newPawn);
     newPawn.classList.add("pawn_" + pawn.size.toLowerCase());
 
     if (pawn.isMob) {
@@ -1641,10 +1641,10 @@ async function createPawnElement(pawn, rotate) {
     }
     await setPawnTokenFromParams(newPawn, pawn);
 
-    map.rotatePawn(newPawn, rotate);
+    pawnManager.rotatePawn(newPawn, rotate);
 
     if (pawn.scale) {
-        map.setTokenScale(newPawn, pawn.scale);
+        pawnManager.setScale(newPawn, pawn.scale);
     }
     return newPawn;
 }
@@ -1983,7 +1983,7 @@ const map = (function () {
     }
 
     function moveObject(elmnt, point, userAction = true) {
-        console.log("Move ", elmnt);
+        if (!elmnt) return;
         var oldX = parseFloat(elmnt.style.left);
         var oldY = parseFloat(elmnt.style.top);
         var diffX = oldX - point.x;
@@ -2095,33 +2095,6 @@ const map = (function () {
         shiftView(shiftAmountX, shiftAmounyY);
     }
 
-    function setTokenScale(pawn, scale) {
-        if (!scale) return;
-        var image = pawn.querySelector(".token_photo");
-        if (!image) return;
-        image.style.setProperty("--pawn-image-scale", scale);
-        console.log(`Set scale  ${scale}`);
-        serverNotifier.notifyServer("token-scale", {
-            id: pawn.id,
-            scale: scale,
-        });
-        var facetArray = image.getAttribute("data-token_facets");
-        if (!facetArray) return;
-        var facets = JSON.parse(facetArray);
-        var current = parseInt(image.getAttribute("data-token_current_facet") || 0);
-        var path = facets[current];
-        if (scale != 1) {
-            localStorage.setItem(`token_scale${path}`, scale);
-        } else {
-            localStorage.removeItem(`token_scale${path}`);
-        }
-    }
-    function getTokenScale(pawn) {
-        var image = pawn.querySelector(".token_photo");
-        if (!image) return 1;
-        return image.style.getPropertyValue("--pawn-image-scale");
-    }
-
     function updateObjectSize(ele) {
         var width, height;
 
@@ -2149,54 +2122,10 @@ const map = (function () {
         return [...pawns.all].find((x) => x.id == id);
     }
 
-    function setPawnRotation(pawn, degrees) {
-        var isMob = pawn.getAttribute("data-mob_size") != null;
-        var element = isMob ? pawn.querySelector(".mob_token_container") : pawn.querySelector(".token_photo");
-        if (isNaN(degrees)) degrees = 0;
-        element.style.setProperty("--pawn-rotate", (degrees || 0) + "deg");
-        if (serverNotifier.isServer()) {
-            serverNotifier.notifyServer("token-rotate-set", {
-                id: pawn.id,
-                deg: pawn.deg,
-            });
-        }
-    }
-    function rotatePawn(pawn, degrees) {
-        if (pawn.deg == null) {
-            pawn.deg = degrees;
-        } else {
-            pawn.deg += degrees;
-        }
-        setPawnRotation(pawn, pawn.deg);
-    }
-
-    /**
-     *
-     * @param {object} options elementId and text properties required
-     * @returns void
-     */
-    function talkBubble(options) {
-        var pawn = getPawnById(options.elementId);
-        if (!pawn) return;
-        var bubble = pawn.querySelector(".token_talkbubble");
-        if (!bubble) {
-            bubble = Util.ele("div", "token_talkbubble", options.text);
-            bubble.onclick = (e) => Util.fadeOut(bubble, 600);
-            pawn.appendChild(bubble);
-        } else {
-            bubble.innerHTML = options.text;
-        }
-    }
-
     return {
         init: init,
         shiftView: shiftView,
         centerOn: centerOn,
-        setTokenScale: setTokenScale,
-        talkBubble: talkBubble,
-        getTokenScale: getTokenScale,
-        rotatePawn: rotatePawn,
-        setPawnRotation: setPawnRotation,
         getPawnById: getPawnById,
         centerForegroundOnBackground: centerForegroundOnBackground,
         updateInitiative: updateInitiative,
diff --git a/docs/client/pawns.js b/docs/client/pawns.js
new file mode 100644
index 0000000..9aad5b3
--- /dev/null
+++ b/docs/client/pawns.js
@@ -0,0 +1,95 @@
+const pawnManager = (function () {
+    const DEAD_ATTRIBUTE = "data-token-dead";
+    function isDead(pawn) {
+        if (!pawn) return false;
+        return pawn.getAttribute(DEAD_ATTRIBUTE) == "true";
+    }
+
+    function kill(pawn) {
+        if (isDead(pawn)) return;
+        pawn.setAttribute(DEAD_ATTRIBUTE, "true");
+    }
+
+    function revive(pawn) {
+        if (!isDead(pawn)) return;
+        pawn.setAttribute(DEAD_ATTRIBUTE, "false");
+    }
+    function rotatePawn(pawn, degrees) {
+        if (pawn.deg == null) {
+            pawn.deg = degrees;
+        } else {
+            pawn.deg += degrees;
+        }
+        setPawnRotation(pawn, pawn.deg);
+    }
+
+    function setPawnRotation(pawn, degrees) {
+        var isMob = pawn.getAttribute("data-mob_size") != null;
+        var element = isMob ? pawn.querySelector(".mob_token_container") : pawn.querySelector(".token_photo");
+        if (isNaN(degrees)) degrees = 0;
+        element.style.setProperty("--pawn-rotate", (degrees || 0) + "deg");
+        if (serverNotifier.isServer()) {
+            serverNotifier.notifyServer("token-rotate-set", {
+                id: pawn.id,
+                deg: pawn.deg,
+            });
+        }
+    }
+
+    function setScale(pawn, scale) {
+        if (!scale) return;
+        var image = pawn.querySelector(".token_photo");
+        if (!image) return;
+        image.style.setProperty("--pawn-image-scale", scale);
+        console.log(`Set scale  ${scale}`);
+        serverNotifier.notifyServer("token-scale", {
+            id: pawn.id,
+            scale: scale,
+        });
+        var facetArray = image.getAttribute("data-token_facets");
+        if (!facetArray) return;
+        var facets = JSON.parse(facetArray);
+        var current = parseInt(image.getAttribute("data-token_current_facet") || 0);
+        var path = facets[current];
+        if (scale != 1) {
+            localStorage.setItem(`token_scale${path}`, scale);
+        } else {
+            localStorage.removeItem(`token_scale${path}`);
+        }
+    }
+    function getScale(pawn) {
+        var image = pawn.querySelector(".token_photo");
+        if (!image) return 1;
+        return image.style.getPropertyValue("--pawn-image-scale");
+    }
+
+    /**
+     *
+     * @param {object} options elementId and text properties required
+     * @returns void
+     */
+    function talkBubble(options) {
+        var pawn = map.getPawnById(options.elementId);
+        if (!pawn) return;
+        var bubble = pawn.querySelector(".token_talkbubble");
+        if (!bubble) {
+            bubble = Util.ele("div", "token_talkbubble", options.text);
+            bubble.onclick = (e) => Util.fadeOut(bubble, 600);
+            pawn.appendChild(bubble);
+        } else {
+            bubble.innerHTML = options.text;
+        }
+        window.setTimeout(()=> Util.fadeOut(bubble, 600), 14000)
+    }
+
+    return {
+        isDead,
+        kill,
+        revive,
+        rotatePawn,
+        setPawnRotation,
+        setScale,
+        getScale,
+        talkBubble,
+    };
+})();
diff --git a/docs/css/map.css b/docs/css/map.css
index 1925a52..4d6a07b 100644
--- a/docs/css/map.css
+++ b/docs/css/map.css
@@ -394,6 +394,8 @@ li {
     border: none !important;
 }
 
+
+
 .pawn {
     position: absolute;
     z-index: var(--z-index-pawn);
@@ -465,7 +467,7 @@ li {
     height: 100%;
 }
 
-.pawn_dead {
+.pawn[data-token-dead=true] {
     background-color: rgba(218, 0, 0, 0.632) !important;
     background-image: url("tokens/dead.png");
 }
diff --git a/package.json b/package.json
index ddd7de0..2d6852a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dungeoneer",
   "productName": "Dungeoneer",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "A tool for Dungeon Masters running 5th edition D&D games.",
   "main": "main.js",
   "scripts": {