4 files changed, 1013 insertions, 83 deletions
diff --git a/public/assets/css/map.css b/public/assets/css/map.css
index 4af73cf..e356374 100644
--- a/public/assets/css/map.css
+++ b/public/assets/css/map.css
@@ -57,6 +57,11 @@ polyline.move-trace {
   transform: translate(1.3px, 1564.1px) rotate(0.1deg) scale(0.999, 1.002);
 }
 
+#map1 {
+  transform-origin: 1142px 759px;
+  transform: rotate(.1deg) translate(-.5px, 5px) scale(.999, 1.005);
+}
+
 #counter-base {
   r: inherit;
 }
@@ -404,7 +409,7 @@ g[data-y="76"] { --i: 76; }
   opacity: 1;
 }
 
-.building .floor {
+.floor {
   fill: white;
 }
 
diff --git a/public/assets/images/map1.svg b/public/assets/images/map1.svg
index 47f8e26..9f514a7 100644
--- a/public/assets/images/map1.svg
+++ b/public/assets/images/map1.svg
@@ -24,6 +24,9 @@
     }
   </style>
   <defs>
+    <polygon id="hex" points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
+    <circle id="counter-base" cx="0" cy="0" r="5"/>
+
     <line id="ast-line" x1="-1.2" y1="0" x2="1.2" y2="0"/>
 
     <pattern id="asterisk" viewBox="-8.66 -15 17.32 30" width="17.32" height="30" patternUnits="userSpaceOnUse">
@@ -42,9 +45,6 @@
       <use x="-8.66" style="transform-origin: -8.66px 0;" class="ccw-60-deg" href="#ast-line"/>
     </pattern>
 
-    <polygon id="hex" points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
-    <circle id="counter-base" cx="0" cy="0" r="5"/>
-
     <g id="t-1" class="troop-counter-template"><use href="#counter-base"/><text>1</text></g>
     <g id="t-2" class="troop-counter-template"><use href="#counter-base"/><text>2</text></g>
     <g id="t-3" class="troop-counter-template"><use href="#counter-base"/><text>3</text></g>
@@ -444,12 +444,143 @@
       m 0 3.5 h 12.75 v 3 h -12.75 z
       m 0 3.5 h 12.75 v 3 h -12.75 z
     "/>
+
+    <g id="tree">
+      <circle class="branches" r="6.5" />
+      <circle class="trunk" r="2" />
+    </g>
+
+    <path id="bush" d="m -4.8419646,1.6815712 c -0.2224,-0.58797 0.0373,-1.22438 -0.11465,-1.82718 -0.13335,-0.57348 -0.0486,-1.19322 0.31662,-1.6677 0.37485,-0.58981 0.9292504,-1.02199 1.5203804,-1.37775 0.37791,-0.29058 0.8322,-0.69438 1.3447,-0.48093 0.52883,0.22124 1.11777002,0.36526 1.69168002,0.27538 0.45164,-0.13122 0.78493,-0.50193 1.10890998,-0.82213 0.23823,-0.4706 0.79876,-0.76529 1.26021,-0.37753 0.75174,0.33698 1.53457,0.94104 1.60186,1.82553 0.009,0.47845 0.33305,0.83858 0.6865,1.11902 0.3949,0.43049 0.5194497,1.08616 0.39622,1.64816 -0.12486,0.51765 -0.59592,0.79391 -1.00538,1.0662 -0.3993,0.35161 -0.92629,0.72761 -0.88679,1.32791 0.0351,0.43819 -0.044,0.93411 -0.4491,1.18369 -0.75886,0.59794 -1.65352998,1.04869 -2.62829997769,1.12983 C -0.59642418,4.8046512 -1.2461242,4.8453312 -1.7811342,4.5051412 c -0.38949,-0.19045 -0.66499,-0.546 -0.75306,-0.96928 -0.19955,-0.51044 -0.67924,-0.93234 -1.24126,-0.95844 -0.4601204,-0.10269 -0.8649404,-0.47575 -1.0665104,-0.89585 z"/>
   </defs>
 
   <rect id="background"/>
 
+  <!-- <g id="image-maps" style="opacity: 1">
+    <image id="map2" class="map-scans" href="scans/map2.jpg" width="2284" height="1518"/>
+    <image class="map-scans" href="row.jpg" width="2284" height="55" y="1505" />
+    <image id="map3" class="map-scans" href="scans/map3.jpg" width="2284" height="1518"/>
+    <image id="map1" class="map-scans" href="scans/map1.jpg" width="2284" height="1518"/>
+  </g> -->
+
   <g class="gameboard">
-    <g id="svg-map2">
+    <g id="svg-map1" style="transform: translate(0, 0px); display: none">
+      <g id="terrain" style="transform: translate(0, -390px)">
+        <rect class="floor" x="225.25" y="501.25" width="105.5" height="136"/>
+        <use x="251" y="524" href="#tree"/>
+        <use x="237.75" y="531.25" href="#tree"/>
+        <use x="268.5" y="523.75" href="#tree"/>
+        <use x="290" y="516" href="#tree"/>
+        <use x="302.75" y="523.75" href="#tree"/>
+        <use x="277.25" y="538.75" href="#tree"/>
+        <use x="298.5" y="546.25" href="#tree"/>
+        <use x="320.25" y="554" href="#tree"/>
+        <use x="246.75" y="561" href="#tree"/>
+        <use x="273" y="561.25" href="#tree"/>
+        <use x="255.25" y="575.75" href="#tree"/>
+        <use x="289.75" y="576.25" href="#tree"/>
+        <use x="237.75" y="590.25" href="#tree"/>
+        <use x="272.5" y="590.75" href="#tree"/>
+        <use x="307" y="590.75" href="#tree"/>
+        <use x="272.75" y="606" href="#tree"/>
+        <use x="298.5" y="605.5" href="#tree"/>
+        <use x="238.5" y="621.5" href="#tree"/>
+        <use x="264.25" y="621" href="#tree"/>
+        <use x="315.5" y="620.75" href="#tree"/>
+
+        <use style="transform: translate(245px, 514px) rotate(28deg)" href="#bush"/>
+        <use style="transform: translate(243.5px, 542px) rotate(-145deg)" href="#bush"/>
+        <use style="transform: translate(278px, 513px) rotate(110deg)" href="#bush"/>
+        <use style="transform: translate(308.5px, 513.5px) rotate(-140deg)" href="#bush"/>
+        <use style="transform: translate(317.5px, 520.75px) rotate(110deg)" href="#bush"/>
+        <use style="transform: translate(324.5px, 531px) rotate(-150deg)" href="#bush"/>
+        <use style="transform: translate(311.5px, 543.5px) rotate(100deg)" href="#bush"/>
+        <use style="transform: translate(240.5px, 571.5px) rotate(-110deg)" href="#bush"/>
+        <use style="transform: translate(260.25px, 561px) rotate(165deg)" href="#bush"/>
+        <use style="transform: translate(312.5px, 562.75px) rotate(-175deg)" href="#bush"/>
+        <use style="transform: translate(325px, 574.5px) rotate(110deg)" href="#bush"/>
+        <use style="transform: translate(268.25px, 578.5px) rotate(-130deg)" href="#bush"/>
+        <use style="transform: translate(277.25px, 572.75px) rotate(-70deg)" href="#bush"/>
+        <use style="transform: translate(308.75px, 573.5px) rotate(-80deg)" href="#bush"/>
+        <use style="transform: translate(318.5px, 587px) rotate(120deg)" href="#bush"/>
+        <use style="transform: translate(234px, 605.25px) rotate(170deg)" href="#bush"/>
+        <use style="transform: translate(244.25px, 600.5px) rotate(145deg)" href="#bush"/>
+        <use style="transform: translate(255px, 605.5px) rotate(-170deg)" href="#bush"/>
+        <use style="transform: translate(259.5px, 592.75px) rotate(100deg)" href="#bush"/>
+        <use style="transform: translate(285px, 615px) rotate(0deg)" href="#bush"/>
+        <use style="transform: translate(295.5px, 629.25px) rotate(0deg)" href="#bush"/>
+        <use style="transform: translate(303px, 620px) rotate(0deg)" href="#bush"/>
+        <use style="transform: translate(311.5px, 605px) rotate(-70deg)" href="#bush"/>
+      </g>
+      <g class="building4" style="transform: translate(100.5px, 83px)">
+        <use href="#building4"/>
+        <g class="furniture">
+          <use style="transform: translate(-21.5px, -39px)" href="#bed"/>
+          <use style="transform: translate(22px, -51px)" href="#bed"/>
+          <use style="transform: translate(21.25px, 33px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-5.75px, 20px)" href="#couch"/>
+          <use style="transform: translate(-9px, -54.75px)" href="#dresser"/>
+          <use style="transform: translate(7.5px, -44.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(25.5px, -18.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-24px, -4.5px)" href="#dresser"/>
+          <use style="transform: translate(24px, 10.5px)" href="#dresser"/>
+          <use style="transform: translate(-16.5px, 33.5px)" href="#dresser"/>
+          <use style="transform: translate(17px, 46.5px)" href="#dresser"/>
+          <use style="transform: translate(-23.5px, 48.25px)" href="#dresser"/>
+        </g>
+      </g>
+      <g class="building2" style="transform: translate(92px, 281px)">
+        <use href="#building2"/>
+        <g class="furniture">
+          <use style="transform: translate(-28.25px, -19.75px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-11.25px, 32.75px)" href="#couch"/>
+
+          <use style="transform: translate(28.25px, -51.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(15.75px, -18.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(13.5px, 16.5px) rotate(32deg)" href="#dresser"/>
+          <use style="transform: translate(39.75px, 32px) rotate(30deg)" href="#dresser"/>
+          <use style="transform: translate(-24.25px, 38.25px) rotate(90deg)" href="#dresser"/>
+
+          <use style="transform: translate(-24px, -42.75px) rotate(0deg)" href="#desk"/>
+          <use style="transform: translate(41.5px, -5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(0.75px, -19.5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(-43.25px, 24px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(3.5px, 39.5px) rotate(90deg)" href="#desk"/>
+        </g>
+      </g>
+      <g class="building3" style="transform: translate(441.5px, 100.5px)">
+        <use style="transform: rotate(180deg)" href="#building3"/>
+        <g class="furniture">
+          <use style="transform: translate(-1.75px, -26.5px)" href="#couch"/>
+          <use style="transform: translate(-8px, 15.5px)" href="#couch"/>
+          <use style="transform: translate(20.5px, 36.75px)" href="#dresser"/>
+          <use style="transform: translate(14.5px, 13px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(26px, -35.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-25.25px, 38.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(13.25px, -19px) rotate(90deg)" href="#desk"/>
+          <path id="stairs" style="transform: translate(-23.75px, -19.25px)" d="
+            M -7 -16.3 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+          "/>
+        </g>
+      </g>
+      <g class="building6" style="transform: translate(440.75px, 288.5px)">
+        <use style="transform: rotate(180deg)" href="#building6"/>
+        <g class="furniture">
+          <use style="transform: translate(-8px, 40px)" href="#bed"/>
+          <use style="transform: translate(-12px, -42px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(10px, 40.25px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(16.25px, -42.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(3px, -12.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(10px, 18.25px) rotate(90deg)" href="#dresser"/>
+        </g>
+      </g>
+    </g>
+    <g id="svg-map2"  style="transform: translate(0, 0px);">
       <g class="building1" style="transform: translate(220px, 280px)">
         <use href="#building1"/>
         <g class="furniture">
@@ -580,8 +711,8 @@
         </g>
       </g>
     </g>
-    <g id="svg-map3">
-      <g class="building1" style="transform: translate(359px, 488.75px)">
+    <g id="svg-map3" style="transform: translate(0, 390.25px);">
+      <g class="building1" style="transform: translate(359px, 98.5px)">
         <use href="#building1"/>
         <g class="furniture">
           <rect class="couch" x="-28.75" y="-51.75" width="16" height="8.5"/>
@@ -596,7 +727,7 @@
           <rect class="bed" x="17.25" y="41.25" width="10" height="18"/>
         </g>
       </g>
-      <g class="building2" style="transform: translate(185px, 467px)">
+      <g class="building2" style="transform: translate(185px, 77.5px)">
         <use style="transform: rotate(180deg)" href="#building2"/>
         <g class="furniture">
           <use style="transform: translate(-39px, -2.75px)" href="#couch"/>
@@ -625,7 +756,7 @@
           "/>
         </g>
       </g>
-      <g class="building3" style="transform: translate(51.25px, 456px)">
+      <g class="building3" style="transform: translate(51.25px, 65.75px)">
         <use href="#building3"/>
         <g class="furniture">
           <use style="transform: translate(2.25px, 23px)" href="#couch"/>
@@ -637,8 +768,7 @@
           <use style="transform: translate(-13.75px, 16px) rotate(90deg)" href="#desk"/>
         </g>
       </g>
-
-      <g class="building4" style="transform: translate(499px, 486px)">
+      <g class="building4" style="transform: translate(499px, 96px)">
         <use style="transform: rotate(180deg)" href="#building4"/>
         <g class="furniture">
           <use style="transform: translate(13.5px, 42px)" href="#bed"/>
@@ -655,8 +785,7 @@
           <use style="transform: translate(-28px, 48.25px) rotate(90deg)" href="#dresser"/>
         </g>
       </g>
-
-      <g class="building5" style="transform: translate(103px, 684.75px)">
+      <g class="building5" style="transform: translate(103px, 294.5px)">
         <use href="#building5"/>
         <g class="furniture">
           <use style="transform: translate(-37px, -17.25px) rotate(90deg)" href="#bed"/>
@@ -673,8 +802,7 @@
           <use style="transform: translate(65px, -5.5px)" href="#stairs"/>
         </g>
       </g>
-
-      <g class="building6" style="transform: translate(224.5px, 665.25px)">
+      <g class="building6" style="transform: translate(224.5px, 275px)">
         <use style="transform: rotate(180deg)" href="#building6"/>
         <g class="furniture">
           <use style="transform: translate(-9px, 39px)" href="#bed"/>
@@ -687,8 +815,7 @@
           <use style="transform: translate(8px, 42.5px)" href="#dresser"/>
         </g>
       </g>
-
-      <g class="building7" style="transform: translate(419px, 696px)">
+      <g class="building7" style="transform: translate(419px, 305.75px)">
         <use href="#building7"/>
         <g class="furniture">
           <use style="transform: translate(-99px, -46.75px)" href="#desk"/>
@@ -2569,10 +2696,5 @@
       </g>
     </g>
   </g>
-  <g id="image-maps" style="opacity: 0.2">
-    <image id="map2" class="map-scans" href="scans/map2.jpg" width="2284" height="1518"/>
-    <image class="map-scans" href="row.jpg" width="2284" height="55" y="1505" />
-    <image id="map3" class="map-scans" href="scans/map3.jpg" width="2284" height="1518"/>
-  </g>
   <script href="http://localhost:8080/map.js"/>
 </svg>
diff --git a/public/assets/images/map2.svg b/public/assets/images/map2.svg
index f1a56a6..0ed68a0 100644
--- a/public/assets/images/map2.svg
+++ b/public/assets/images/map2.svg
@@ -8,12 +8,47 @@
 
     g[data-edge="north"] { --i: -2; }
     g[data-edge="south"] { --i: 78; }
+
+    #background {
+      stroke: #304b75;
+      fill: #bacae3;
+    }
+
+    pattern use {
+      stroke: black;
+      stroke-width: 0.3px;
+    }
+
+    .cw-60-deg {
+      transform: rotate(60deg);
+    }
+
+    .ccw-60-deg {
+      transform: rotate(-60deg);
+    }
   </style>
   <defs>
     <polygon id="hex" points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
-
     <circle id="counter-base" cx="0" cy="0" r="5"/>
 
+    <line id="ast-line" x1="-1.2" y1="0" x2="1.2" y2="0"/>
+
+    <pattern id="asterisk" viewBox="-8.66 -15 17.32 30" width="17.32" height="30" patternUnits="userSpaceOnUse">
+      <use y="-15" href="#ast-line"/>
+      <use y="-15" style="transform-origin: 0 -15px;" class="cw-60-deg" href="#ast-line"/>
+      <use y="-15" style="transform-origin: 0 -15px;" class="ccw-60-deg" href="#ast-line"/>
+      <use y="15" href="#ast-line"/>
+      <use y="15" style="transform-origin: 0 15px;" class="cw-60-deg" href="#ast-line"/>
+      <use y="15" style="transform-origin: 0 15px;" class="ccw-60-deg" href="#ast-line"/>
+
+      <use x="8.66" href="#ast-line"/>
+      <use x="8.66" style="transform-origin: 8.66px 0;" class="cw-60-deg" href="#ast-line"/>
+      <use x="8.66" style="transform-origin: 8.66px 0;" class="ccw-60-deg" href="#ast-line"/>
+      <use x="-8.66" href="#ast-line"/>
+      <use x="-8.66" style="transform-origin: -8.66px 0;" class="cw-60-deg" href="#ast-line"/>
+      <use x="-8.66" style="transform-origin: -8.66px 0;" class="ccw-60-deg" href="#ast-line"/>
+    </pattern>
+
     <g id="t-1" class="troop-counter-template"><use href="#counter-base"/><text>1</text></g>
     <g id="t-2" class="troop-counter-template"><use href="#counter-base"/><text>2</text></g>
     <g id="t-3" class="troop-counter-template"><use href="#counter-base"/><text>3</text></g>
@@ -25,6 +60,354 @@
     <image id="counter-prone" href="counter_prone.jpg" width="10"/>
     <image id="counter-grenade" href="counter_grenade.jpg" width="10"/>
 
+    <g id="building1" class="building">
+      <rect class="floor" x="-33.25" y="-62.25" width="66.5" height="124.5"/>
+      <path style="stroke-width: 2;" class="walls" d="
+        M -33.25 -62.25 V 62.25 H 33.25 V -62.25 Z
+        M -6.75 -37.75 V 6.25 H 2.25 V 62.25
+        M -33.25 16.25 H -7.75 V 62.25
+        M 2.25 39.25 H 33.25
+        M 13.75 6.25 V -1.25 H 33.25
+      "/>
+      <path style="stroke: white;" class="walls" d="
+        M -33.25 -62.25 V 62.25 H 33.25 V -62.25 Z
+        M -6.75 -37.75 V 6.25 H 2.25 V 62.25
+        M -33.25 16.25 H -7.75 V 62.25
+        M 2.25 39.25 H 33.25
+        M 13.75 6.25 V -1.25 H 33.25
+      "/>
+      <path class="windows" d="
+        M -33.25 -45.74 V -33.25
+        M -33.25 40.75 V 53.75
+        M 11.75 62.25 H 31.25
+      "/>
+      <path class="door-edges" d="
+        M -33.25 -16.25 V -13.75 M -33.25 -5.75 V -3.25
+        M -7.75 26.25 V 29.25 M -7.75 36.25 V 39.25
+        M 2.25 13.75 V 16.25 M 2.25 24.25 V 26.75
+        M 2.25 40.25 V 42.75 M 2.25 50.75 V 53.25
+        M -3.25 -62.25 H -0.75 M 11.25 -62.25 H 13.25
+      "/>
+      <path class="doors" d="
+        M -33.25 -13.75 V -5.75
+        M -7.75 29.25 V 36.25
+        M 2.25 16.25 V 24.25
+        M 2.25 42.75 V 50.75
+        M -0.75 -62.25 H 11.25
+      "/>
+    </g>
+
+    <g id="building2" class="building">
+      <polygon class="floor" points="-33.5,-60.5 33.5,-60.5 33.5,-34 52,-3.5 52,30.5 35.5,60.5 -34,60.5 -52,34.5 -52,-3.5 -33.5,-34"/>
+      <path style="stroke-width: 2;" class="walls" d="
+        M -33.5 -60.5 V -34 L -52 -3 V 31 L -35 60.5 H 34.5
+        L 52 31.5 V -3.5 L 34.5 -34 V -60.5 Z
+        M -33.5 -34 H 34.5 M 1 -34 V -60.5
+        M 9.5 -34 V 5.5 H -52
+        M -18 5.5 V 60.5
+        M 9.5 5.5 L 20 12 M 35.5 21 L 51 30.5
+      "/>
+      <path style="stroke: white;" class="walls" d="
+        M -33.5 -60.5 V -34 L -52 -3 V 31 L -35 60.5 H 34.5
+        L 52 31.5 V -3.5 L 34.5 -34 V -60.5 Z
+        M -33.5 -34 H 34.5 M 1 -34 V -60.5
+        M 9.5 -34 V 5.5 H -52
+        M -18 5.5 V 60.5
+        M 9.5 5.5 L 20 12 M 35.5 21 L 51 30.5
+      "/>
+      <path class="windows" d="
+        M -27 -60.5 H -17
+        M 42 -21 L 47 -12.2
+        M 52 10 V 20.5
+        M 38.7 53.5 L 44.1 44.5
+        M -37.7 55.8 L -43 46.6
+      "/>
+      <path class="door-edges" d="
+        M 7 -60.5 H 17.5
+        M -19 -34 H -9
+        M 15.5 -34 H 25.5
+        M -40.5 5.5 H -23.5
+        M -12 5.5 H -1.5
+        M -6 60.5 H 10.5
+      "/>
+      <path class="doors" d="
+        M 9.5 -60.5 H 15
+        M -16.5 -34 H -11.5
+        M 18 -34 H 23
+        M -38 5.5 H -26
+        M -9.5 5.5 H -4
+        M -3.5 60.5 H 8
+      "/>
+    </g>
+
+    <g id="building3" class="building">
+      <rect class="floor" x="-32.25" y="-44" width="64.5" height="88"/>
+      <path style="stroke-width: 2;" class="walls" d="
+        M -32.25 -44 h 64.5 v 88 h -64 z
+        m 37.5 0 v 18
+        m -37.5 0 h 64.5
+        m -36.5 0 v 10.5
+        m 0 21 V 44
+        m 24.5 -34.5 h 12
+      "/>
+      <path style="stroke: white;" class="walls" d="
+        M -32.25 -44 h 64.5 v 88 h -64 z
+        m 37.5 0 v 18
+        m -37.5 0 h 64.5
+        m -36.5 0 v 10.5
+        m 0 21 V 44
+        m 24.5 -34.5 h 12
+      "/>
+      <path class="windows" d="
+        M -13.75 -44 h 10.5
+        M 32.25 -10 v 10
+        M 23 44 h -10.5
+        M -32.25 29 v -10.5
+        m 0 -21 v -10
+      "/>
+      <path class="door-edges" d="
+        M 12 -44 h 10.5
+        m -45 18 h 10.5
+        m 24.5 0 h 10.5
+        M -22 44 h 10.5
+      "/>
+      <path class="doors" d="
+        M 15 -44 h 5
+        m -40 18 h 5.5
+        m 29 0 h 5.5
+        M -19.5 44 h 5.5
+      "/>
+    </g>
+
+    <g id="building4" class="building">
+      <rect class="floor" x="-35.25" y="-62.25" width="70.5" height="124.5"/>
+      <path style="stroke-width: 2;" class="walls" d="
+        M -35.25 -62.25 h 70.5 v 124.5 h -70.5 z
+        m 35.5 0 v 50 h -35.5
+        m 35.5 -14 h 35
+        m -17 0 v 30
+        m 17 0 h -34.5 v 58
+        m 34.5 -22.25 h -34
+        m -16 1.5 h -20
+      "/>
+      <path style="stroke: white;" class="walls" d="
+        M -35.25 -62.25 h 70.5 v 124.5 h -70.5 z
+        m 35.5 0 v 50 h -35.5
+        m 35.5 -14 h 35
+        m -17 0 v 30
+        m 17 0 h -34.5 v 58
+        m 34.5 -22.25 h -34
+        m -16 1.5 h -20
+      "/>
+      <path class="windows" d="
+        M 35.25 -44 v 10.5
+        m 0 51 v 10
+        m -14.5 34.75 h -15.5
+        m -40.5 -50 v -10
+        m 0 -18 v -10
+      "/>
+      <path class="door-edges" d="
+        M -27 -62.25 h 10
+        m 20 36 h 10
+        m -31 14 h 10
+        m 26.25 -1.5 v 10
+        m -15.25 7.5 h 10
+        m -12.25 40 v 10
+        m -31 8.5 h 16
+      "/>
+      <path class="doors" d="
+        M -24.5 -62.25 h 5
+        m 25 36 h 5
+        m -26 14 h 5
+        m 28.75 1 v 5
+        m -13 10 h 5.5
+        m -10 42.25 v 5.5
+        m -28.5 10.75 h 11
+      "/>
+    </g>
+
+    <g id="building5" class="building">
+      <rect class="floor" x="-75" y="-32.75" width="150" height="65.5"/>
+      <path style="stroke-width: 2;" class="walls" d="
+        M -75 -32.75 h 150 v 65.5 h -150 z
+        m 0 13 h 8 m 13 0 h 7
+        m 0 -13 v 26.5
+        m 43 -26.5 v 26.5
+        m 38 -26.5 v 26.5
+        m 23.5 -26.5 v 65.5
+        m -132.5 -39 h 7 m 14 0 h 111
+        m 15 1.5 h 3
+        m -105.25 -1.5 v 7.5
+        m 0 17.5 v 13.5
+        m 36.5 0 v -13.5
+        m 4.5 -19 v -6
+      "/>
+      <path style="stroke: white;" class="walls" d="
+        M -75 -32.75 h 150 v 65.5 h -150 z
+        m 0 13 h 8 m 13 0 h 7
+        m 0 -13 v 26.5
+        m 43 -26.5 v 26.5
+        m 38 -26.5 v 26.5
+        m 23.5 -26.5 v 65.5
+        m -132.5 -39 h 7 m 14 0 h 111
+        m 15 1.5 h 3
+        m -105.25 -1.5 v 7.5
+        m 0 17.5 v 13.5
+        m 36.5 0 v -13.5
+        m 4.5 -19 v -6
+      "/>
+      <path class="windows" d="
+        M -21 -32.75 h 10
+        m 33 0 h 10
+        m 6.5 0 h 10
+        m 9 51 v 10
+        m -31 4.5 h -16
+        m -19.5 0 h -16
+        M -75 2 v 10
+        m 0 7 v 10
+      "/>
+      <path class="door-edges" d="
+        M -75 -17.75 v 9.5
+        m 150 -22 v 10
+        m -17.5 21 v 10
+        m -2 -17 h -9
+        m -38 0 h -10
+        m -10.5 0 h -10
+      "/>
+      <path class="doors" d="
+        M -75 -15.75 v 5.5
+        m 150 -18 v 6
+        m -17.5 25 v 6
+        m -4 -15 h -5
+        m -43 0 h -4.5
+        m -15.5 0 h -5
+      "/>
+    </g>
+
+    <g id="building6" class="building">
+      <rect class="floor" x="-23" y="-58.75" width="46" height="117.5"/>
+      <path style="stroke-width: 2;" class="walls" d="
+        M -23 -58.75 h 46 v 117.5 h -46 z
+        m 19.5 0 v 44 h 26.5
+        M -23 26.25 h 46
+        m -18.5 0 v -16
+      "/>
+      <path style="stroke: white;" class="walls" d="
+        M -23 -58.75 h 46 v 117.5 h -46 z
+        m 19.5 0 v 44 h 26.5
+        M -23 26.25 h 46
+        m -18.5 0 v -16
+      "/>
+      <path class="windows" d="
+        M 3.5 -58.75 h 10
+        m 9.5 56 v 10.5
+        m 0 20.5 v 10.5
+        M -23 -31 v 10.5
+        m 0 18 v 10.5
+      "/>
+      <path class="door-edges" d="
+        M -23 -46.5 v 10
+        m 23.5 21.75 h 16.5
+        m -30.75 41 h 10
+        m -10 32.5 h 10
+      "/>
+      <path class="doors" d="
+        M -23 -44 v 5
+        m 26 24.25 h 11.5
+        m -26 41 h 5.5
+        m -5 32.5 h 5
+      "/>
+    </g>
+
+    <g id="building7" class="building">
+      <polygon class="floor" points="
+      -113.25,-56.5 -73.25,-56.5 -50.75,-69.5 113.25,-69.5 113.25,43.5 10.75,43.5
+      5.75,32 -80.25,32 -87.25,44.5 -113.25,44.5
+      "/>
+      <path style="stroke-width: 2;" class="walls" d="
+        M -113.25 -56.5 h 40 l 22.5 -13 h 164 v 113
+        h -102.5 l -5 -11.5 h -86 l -7 12.5 h -26 z
+        m 0 38 h 13 m 19.5 1.5 h 46.5 v -52.5
+        m 0 37 h 44 v -37
+        m 0 30.5 h 37.5 v -30.5
+        m 0 30.5 h 33
+        m 0 -30.5 v 81 h 33
+        m -34.5 32 v -31.5 h -98.5 v 20
+        m 65.5 11.5 v -31.5
+        m -47 0 v 20
+        m -37 0 v -19.5 h -21 v -12 h -21.5 v 14
+        m 26.5 17.5 v -19.5
+        m -18.5 1.5 v 18
+      "/>
+      <path style="stroke: white;" class="walls" d="
+        M -113.25 -56.5 h 40 l 22.5 -13 h 164 v 113
+        h -102.5 l -5 -11.5 h -86 l -7 12.5 h -26 z
+        m 0 38 h 13 m 19.5 1.5 h 46.5 v -52.5
+        m 0 37 h 44 v -37
+        m 0 30.5 h 37.5 v -30.5
+        m 0 30.5 h 33
+        m 0 -30.5 v 81 h 33
+        m -34.5 32 v -31.5 h -98.5 v 20
+        m 65.5 11.5 v -31.5
+        m -47 0 v 20
+        m -37 0 v -19.5 h -21 v -12 h -21.5 v 14
+        m 26.5 17.5 v -19.5
+        m -18.5 1.5 v 18
+      "/>
+      <path class="windows" d="
+        M -94.75 -56.5 h 10.25
+        m 19 -4.5 l 9 -5.25
+        m 32 -3.25 h 10
+        m 77 0 h 10
+        m 40.75 2 v 9.5
+        m 0 32.75 v 10
+        m -5.5 58.75 h -10.5
+        m -24.5 0 h -10
+        m -25 0 h -10
+        m -17.25 -.75 l -4 -9
+        m -87.75 0 l -5 9
+        m -27 -.5 v -10
+        m 0 -63.5 v -10
+      "/>
+      <path class="door-edges" d="
+        M 12 -69.5 h 10
+        m -3 30.5 h 10
+        m 24.25 0 h 10
+        m 17 13.25 v 10
+        m 21 27.25 h -16
+        m -12.5 .5 h -10
+        m -24.5 0 h -10
+        m -31.75 0 h -14
+        m -22.75 .5 h -12
+        m 25 -45 h 16
+        M -113.25 -9.5 v 10
+      "/>
+      <path class="doors" d="
+        M 14.5 -69.5 h 5
+        m 2 30.5 h 5
+        m 29.25 0 h 5
+        m 19.5 15.75 v 5
+        m 18.5 29.75 h -11
+        m -17.5 .5 h -5
+        m -29.5 0 h -5
+        m -36.75 0 h -9
+        m -27.75 .5 h -7
+        m 25 -45 h 11
+        M -113.25 -6.75 v 5
+      "/>
+    </g>
+
+    <polygon id="desk" points="-1.5,-7 4.5,-7 4.5,7 -1.5,7 -2.5,6 -2.5,3 -4.5,3 -4.5,-3 -2.5,-3 -2.5,-6"/>
+    <rect id="couch" x="-4.25" y="-8" width="8.5" height="16"/>
+    <rect id="bed" x="-5" y="-9" width="10" height="18"/>
+    <rect id="dresser" x="-2.5" y="-4.75" width="5" height="9.5"/>
+    <path id="stairs" d="
+      M -6.375 -13.6 h 12.75 v 3 h -12.75 z
+      m 0 3.5 h 12.75 v 3 h -12.75 z
+      m 0 3.5 h 12.75 v 3 h -12.75 z
+      m 0 3.5 h 12.75 v 3 h -12.75 z
+    "/>
+
     <g id="tree">
       <circle class="branches" r="6.5" />
       <circle class="trunk" r="2" />
@@ -35,61 +418,400 @@
 
   <rect id="background"/>
 
-  <g id="image-maps">
-    <image id="map2" class="map-scans" href="scans/map2.jpg" width="2284" height="1518"/>
-    <image class="map-scans" href="row.jpg" width="2284" height="55" y="1505" />
-    <image id="map1" class="map-scans" href="scans/map1.jpg" width="2284" height="1518" y="1565"/>
-    <image class="map-scans" href="row.jpg" width="2284" height="55" y="3065" />
-    <image id="map3" class="map-scans" href="scans/map3.jpg" width="2284" height="1518" y="3125"/>
-  </g>
-
   <g class="gameboard">
-    <g id="terrain">
-      <use x="251" y="524" href="#tree"/>
-      <use x="237.75" y="531.25" href="#tree"/>
-      <use x="268.5" y="523.75" href="#tree"/>
-      <use x="290" y="516" href="#tree"/>
-      <use x="302.75" y="523.75" href="#tree"/>
-      <use x="277.25" y="538.75" href="#tree"/>
-      <use x="298.5" y="546.25" href="#tree"/>
-      <use x="320.25" y="554" href="#tree"/>
-      <use x="246.75" y="561" href="#tree"/>
-      <use x="273" y="561.25" href="#tree"/>
-      <use x="255.25" y="575.75" href="#tree"/>
-      <use x="289.75" y="576.25" href="#tree"/>
-      <use x="237.75" y="590.25" href="#tree"/>
-      <use x="272.5" y="590.75" href="#tree"/>
-      <use x="307" y="590.75" href="#tree"/>
-      <use x="272.75" y="606" href="#tree"/>
-      <use x="298.5" y="605.5" href="#tree"/>
-      <use x="238.5" y="621.5" href="#tree"/>
-      <use x="264.25" y="621" href="#tree"/>
-      <use x="315.5" y="620.75" href="#tree"/>
-
-      <use style="transform: translate(245px, 514px) rotate(28deg)" href="#bush"/>
-      <use style="transform: translate(243.5px, 542px) rotate(-145deg)" href="#bush"/>
-      <use style="transform: translate(278px, 513px) rotate(110deg)" href="#bush"/>
-      <use style="transform: translate(308.5px, 513.5px) rotate(-140deg)" href="#bush"/>
-      <use style="transform: translate(317.5px, 520.75px) rotate(110deg)" href="#bush"/>
-      <use style="transform: translate(324.5px, 531px) rotate(-150deg)" href="#bush"/>
-      <use style="transform: translate(311.5px, 543.5px) rotate(100deg)" href="#bush"/>
-      <use style="transform: translate(240.5px, 571.5px) rotate(-110deg)" href="#bush"/>
-      <use style="transform: translate(260.25px, 561px) rotate(165deg)" href="#bush"/>
-      <use style="transform: translate(312.5px, 562.75px) rotate(-175deg)" href="#bush"/>
-      <use style="transform: translate(325px, 574.5px) rotate(110deg)" href="#bush"/>
-      <use style="transform: translate(268.25px, 578.5px) rotate(-130deg)" href="#bush"/>
-      <use style="transform: translate(277.25px, 572.75px) rotate(-70deg)" href="#bush"/>
-      <use style="transform: translate(308.75px, 573.5px) rotate(-80deg)" href="#bush"/>
-      <use style="transform: translate(318.5px, 587px) rotate(120deg)" href="#bush"/>
-      <use style="transform: translate(234px, 605.25px) rotate(170deg)" href="#bush"/>
-      <use style="transform: translate(244.25px, 600.5px) rotate(145deg)" href="#bush"/>
-      <use style="transform: translate(255px, 605.5px) rotate(-170deg)" href="#bush"/>
-      <use style="transform: translate(259.5px, 592.75px) rotate(100deg)" href="#bush"/>
-      <use style="transform: translate(285px, 615px) rotate(0deg)" href="#bush"/>
-      <use style="transform: translate(295.5px, 629.25px) rotate(0deg)" href="#bush"/>
-      <use style="transform: translate(303px, 620px) rotate(0deg)" href="#bush"/>
-      <use style="transform: translate(311.5px, 605px) rotate(-70deg)" href="#bush"/>
+    <g id="svg-map1" style="transform: translate(0, 390px);">
+      <g id="terrain" style="transform: translate(0, -390px)">
+        <rect class="floor" x="225.25" y="501.25" width="105.5" height="136"/>
+        <use x="251" y="524" href="#tree"/>
+        <use x="237.75" y="531.25" href="#tree"/>
+        <use x="268.5" y="523.75" href="#tree"/>
+        <use x="290" y="516" href="#tree"/>
+        <use x="302.75" y="523.75" href="#tree"/>
+        <use x="277.25" y="538.75" href="#tree"/>
+        <use x="298.5" y="546.25" href="#tree"/>
+        <use x="320.25" y="554" href="#tree"/>
+        <use x="246.75" y="561" href="#tree"/>
+        <use x="273" y="561.25" href="#tree"/>
+        <use x="255.25" y="575.75" href="#tree"/>
+        <use x="289.75" y="576.25" href="#tree"/>
+        <use x="237.75" y="590.25" href="#tree"/>
+        <use x="272.5" y="590.75" href="#tree"/>
+        <use x="307" y="590.75" href="#tree"/>
+        <use x="272.75" y="606" href="#tree"/>
+        <use x="298.5" y="605.5" href="#tree"/>
+        <use x="238.5" y="621.5" href="#tree"/>
+        <use x="264.25" y="621" href="#tree"/>
+        <use x="315.5" y="620.75" href="#tree"/>
+
+        <use style="transform: translate(245px, 514px) rotate(28deg)" href="#bush"/>
+        <use style="transform: translate(243.5px, 542px) rotate(-145deg)" href="#bush"/>
+        <use style="transform: translate(278px, 513px) rotate(110deg)" href="#bush"/>
+        <use style="transform: translate(308.5px, 513.5px) rotate(-140deg)" href="#bush"/>
+        <use style="transform: translate(317.5px, 520.75px) rotate(110deg)" href="#bush"/>
+        <use style="transform: translate(324.5px, 531px) rotate(-150deg)" href="#bush"/>
+        <use style="transform: translate(311.5px, 543.5px) rotate(100deg)" href="#bush"/>
+        <use style="transform: translate(240.5px, 571.5px) rotate(-110deg)" href="#bush"/>
+        <use style="transform: translate(260.25px, 561px) rotate(165deg)" href="#bush"/>
+        <use style="transform: translate(312.5px, 562.75px) rotate(-175deg)" href="#bush"/>
+        <use style="transform: translate(325px, 574.5px) rotate(110deg)" href="#bush"/>
+        <use style="transform: translate(268.25px, 578.5px) rotate(-130deg)" href="#bush"/>
+        <use style="transform: translate(277.25px, 572.75px) rotate(-70deg)" href="#bush"/>
+        <use style="transform: translate(308.75px, 573.5px) rotate(-80deg)" href="#bush"/>
+        <use style="transform: translate(318.5px, 587px) rotate(120deg)" href="#bush"/>
+        <use style="transform: translate(234px, 605.25px) rotate(170deg)" href="#bush"/>
+        <use style="transform: translate(244.25px, 600.5px) rotate(145deg)" href="#bush"/>
+        <use style="transform: translate(255px, 605.5px) rotate(-170deg)" href="#bush"/>
+        <use style="transform: translate(259.5px, 592.75px) rotate(100deg)" href="#bush"/>
+        <use style="transform: translate(285px, 615px) rotate(0deg)" href="#bush"/>
+        <use style="transform: translate(295.5px, 629.25px) rotate(0deg)" href="#bush"/>
+        <use style="transform: translate(303px, 620px) rotate(0deg)" href="#bush"/>
+        <use style="transform: translate(311.5px, 605px) rotate(-70deg)" href="#bush"/>
+      </g>
+      <g class="building4" style="transform: translate(100.5px, 83px)">
+        <use href="#building4"/>
+        <g class="furniture">
+          <use style="transform: translate(-21.5px, -39px)" href="#bed"/>
+          <use style="transform: translate(22px, -51px)" href="#bed"/>
+          <use style="transform: translate(21.25px, 33px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-5.75px, 20px)" href="#couch"/>
+          <use style="transform: translate(-9px, -54.75px)" href="#dresser"/>
+          <use style="transform: translate(7.5px, -44.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(25.5px, -18.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-24px, -4.5px)" href="#dresser"/>
+          <use style="transform: translate(24px, 10.5px)" href="#dresser"/>
+          <use style="transform: translate(-16.5px, 33.5px)" href="#dresser"/>
+          <use style="transform: translate(17px, 46.5px)" href="#dresser"/>
+          <use style="transform: translate(-23.5px, 48.25px)" href="#dresser"/>
+        </g>
+      </g>
+      <g class="building2" style="transform: translate(92px, 281px)">
+        <use href="#building2"/>
+        <g class="furniture">
+          <use style="transform: translate(-28.25px, -19.75px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-11.25px, 32.75px)" href="#couch"/>
+
+          <use style="transform: translate(28.25px, -51.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(15.75px, -18.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(13.5px, 16.5px) rotate(32deg)" href="#dresser"/>
+          <use style="transform: translate(39.75px, 32px) rotate(30deg)" href="#dresser"/>
+          <use style="transform: translate(-24.25px, 38.25px) rotate(90deg)" href="#dresser"/>
+
+          <use style="transform: translate(-24px, -42.75px) rotate(0deg)" href="#desk"/>
+          <use style="transform: translate(41.5px, -5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(0.75px, -19.5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(-43.25px, 24px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(3.5px, 39.5px) rotate(90deg)" href="#desk"/>
+        </g>
+      </g>
+      <g class="building3" style="transform: translate(441.5px, 100.5px)">
+        <use style="transform: rotate(180deg)" href="#building3"/>
+        <g class="furniture">
+          <use style="transform: translate(-1.75px, -26.5px)" href="#couch"/>
+          <use style="transform: translate(-8px, 15.5px)" href="#couch"/>
+          <use style="transform: translate(20.5px, 36.75px)" href="#dresser"/>
+          <use style="transform: translate(14.5px, 13px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(26px, -35.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-25.25px, 38.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(13.25px, -19px) rotate(90deg)" href="#desk"/>
+          <path id="stairs" style="transform: translate(-23.75px, -19.25px)" d="
+            M -7 -16.3 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+          "/>
+        </g>
+      </g>
+      <g class="building6" style="transform: translate(440.75px, 288.5px)">
+        <use style="transform: rotate(180deg)" href="#building6"/>
+        <g class="furniture">
+          <use style="transform: translate(-8px, 40px)" href="#bed"/>
+          <use style="transform: translate(-12px, -42px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(10px, 40.25px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(16.25px, -42.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(3px, -12.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(10px, 18.25px) rotate(90deg)" href="#dresser"/>
+        </g>
+      </g>
+    </g>
+    <g id="svg-map2"  style="transform: translate(0, 0px);">
+      <g class="building1" style="transform: translate(220px, 280px)">
+        <use href="#building1"/>
+        <g class="furniture">
+          <use style="transform: translate(-22.5px, -49px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-22.5px, 37px)" href="#bed"/>
+          <use style="transform: translate(22.5px, 50.5px)" href="#bed"/>
+          <use style="transform: translate(17.5px, -47px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(20.5px, -19px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(7.5px, -10.75px)" href="#dresser"/>
+          <use style="transform: translate(-14.5px, -1px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(26px, 11.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(27px, 26px)" href="#dresser"/>
+          <use style="transform: translate(-26.75px, 58px) rotate(90deg)" href="#dresser"/>
+        </g>
+      </g>
+      <g class="building2" style="transform: translate(108px, 282px)">
+        <use href="#building2"/>
+        <g class="furniture">
+          <rect class="couch" x="-46" y="11" width="8.5" height="16"/>
+          <rect class="couch" x="-15.5" y="36" width="16" height="8.5"/>
+          <rect class="coffee-table" x="3.5" y="-54.5" width="5" height="9.5"/>
+          <rect class="coffee-table" x="-2" y="-20" width="9.5" height="5"/>
+          <rect class="coffee-table" x="40" y="-4.5" width="9.5" height="5"/>
+          <rect class="coffee-table" x="-29.5" y="36" width="9.5" height="5"/>
+          <rect class="coffee-table" style="transform-origin: 13.25px 16.5px; transform: rotate(-57deg)" x="8.5" y="14.5" width="9.5" height="5"/>
+          <use style="transform: translate(19.5px, -1px)" href="#desk"/>
+          <use style="transform: translate(28px, -47px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(20.5px, 38px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(-30px, -21.5px)" href="#desk"/>
+          <use style="transform: translate(-25px, -49px)" href="#desk"/>
+        </g>
+      </g>
+      <g class="building3" style="transform: translate(485.5px, 264.5px)">
+        <use style="transform: rotate(180deg)" href="#building3"/>
+        <g class="furniture">
+          <use style="transform: translate(-2px, -28.5px)" href="#couch"/>
+          <use style="transform: translate(-18px, 12.5px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(17.75px, 35.25px)" href="#dresser"/>
+          <use style="transform: translate(17.75px, 5px)" href="#dresser"/>
+          <use style="transform: translate(-.5px, 4px)" href="#dresser"/>
+          <use style="transform: translate(-17px, -1px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-24.5px, -18px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(17.5px, -17.5px) rotate(-90deg)" href="#desk"/>
+        </g>
+      </g>
+      <g class="building4" style="transform: translate(377.25px, 278.75px)">
+        <use href="#building4"/>
+        <g class="furniture">
+          <use style="transform: translate(-13.5px, -39px)" href="#bed"/>
+          <use style="transform: translate(12px, -51px)" href="#bed"/>
+          <use style="transform: translate(23.5px, 48px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(-22.75px, -1.5px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-28px, -29.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(28px, -48.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(29px, -18px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-6px, 14.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(28px, 10.5px)" href="#dresser"/>
+          <use style="transform: translate(-22.5px, 34px)" href="#dresser"/>
+          <use style="transform: translate(7.5px, 29px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-30.5px, 48.5px)" href="#dresser"/>
+        </g>
+      </g>
+      <g class="building5" style="transform: translate(103px, 84.75px)">
+        <use href="#building5"/>
+        <g class="furniture">
+          <use style="transform: translate(-36px, -17.25px) rotate(90deg)" href="#bed"/>
+          <use style="transform: translate(23px, -17.25px) rotate(90deg)" href="#bed"/>
+          <use style="transform: translate(-40.25px, -.5px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-58.5px, 27px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-8px, 20.5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(-48px, 12.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(17.5px, 2.5px)" href="#dresser"/>
+          <use style="transform: translate(35.75px, 2.25px)" href="#dresser"/>
+          <use style="transform: translate(30.25px, 25.5px)" href="#dresser"/>
+          <use style="transform: translate(38.5px, -17.5px)" href="#dresser"/>
+          <use style="transform: translate(49.75px, 13.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(65px, -5.5px)" href="#stairs"/>
+        </g>
+      </g>
+      <g class="building6" style="transform: translate(224px, 85.75px)">
+        <use href="#building6"/>
+        <g class="furniture">
+          <use style="transform: translate(9.5px, -40.5px)" href="#bed"/>
+          <use style="transform: translate(-8px, 11.5px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(8.75px, 48.75px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(-8px, -41px)" href="#dresser"/>
+          <use style="transform: translate(12px, 12px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-15px, 42.5px) rotate(90deg)" href="#dresser"/>
+        </g>
+      </g>
+      <g class="building7" style="transform: translate(427.75px, 110px)">
+        <use href="#building7"/>
+        <g class="furniture">
+          <use style="transform: translate(-99px, -46.5px)" href="#desk"/>
+          <use style="transform: translate(-106px, 22px)" href="#desk"/>
+          <use style="transform: translate(-46px, -58.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-1.5px, -61.5px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(-1px, -41.5px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(-28.75px, 16.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(32.5px, 32px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(54.5px, 32.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(69.5px, 28.25px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(88px, 31.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(104px, 23.75px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(104.5px, -2px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(103.5px, -41.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(103.25px, -59.75px) rotate(90deg)" href="#desk"/>
+
+          <use style="transform: translate(-107px, -27.75px) rotate(0deg)" href="#dresser"/>
+          <use style="transform: translate(-75.5px, -37.75px) rotate(0deg)" href="#dresser"/>
+          <use style="transform: translate(-63.5px, -26.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-62px, 17.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(6px, 5.5px)" href="#dresser"/>
+          <use style="transform: translate(12.5px, 21.5px)" href="#dresser"/>
+          <use style="transform: translate(48.25px, -32.5px)" href="#dresser"/>
+          <use style="transform: translate(65px, -58px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(73px, -29.25px) rotate(90deg)" href="#dresser"/>
+
+          <path class="stairs" style="transform: translate(34.5px, -63.25px) rotate(-90deg)" d="
+            M -5.25 -10.95 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+          "/>
+        </g>
+      </g>
+    </g>
+    <g id="svg-map3" style="transform: translate(0, 780px)">
+      <g class="building1" style="transform: translate(359px, 98.5px)">
+        <use href="#building1"/>
+        <g class="furniture">
+          <rect class="couch" x="-28.75" y="-51.75" width="16" height="8.5"/>
+          <rect class="coffee-table" x="12.75" y="-48.75" width="9.5" height="5"/>
+          <rect class="coffee-table" x="22.75" y="-34.75" width="9.5" height="5"/>
+          <rect class="coffee-table" x="-18.75" y="-2.75" width="9.5" height="5"/>
+          <rect class="coffee-table" x="-31.75" y="24.25" width="9.5" height="5"/>
+          <rect class="coffee-table" x="22.25" y="27.25" width="9.5" height="5"/>
+          <rect class="coffee-table" x="23.25" y="10.75" width="5" height="9.5"/>
+          <rect class="coffee-table" x="12.25" y="-29.75" width="5" height="9.5"/>
+          <rect class="bed" x="-19.75" y="42.25" width="10" height="18"/>
+          <rect class="bed" x="17.25" y="41.25" width="10" height="18"/>
+        </g>
+      </g>
+      <g class="building2" style="transform: translate(185px, 77.5px)">
+        <use style="transform: rotate(180deg)" href="#building2"/>
+        <g class="furniture">
+          <use style="transform: translate(-39px, -2.75px)" href="#couch"/>
+          <use style="transform: translate(5.25px, -41px) rotate(90deg)" href="#couch"/>
+
+          <use style="transform: translate(-14.5px, -16.25px) rotate(29deg)" href="#dresser"/>
+          <use style="transform: translate(-16.75px, 6.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-28.25px, 52px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(23.75px, -38.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(32.5px, 21.5px) rotate(-60deg)" href="#dresser"/>
+
+          <use style="transform: translate(-20px, -40px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(40px, -19px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(4.5px, 10.5px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(-11px, 48px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(25px, 48px) rotate(180deg)" href="#desk"/>
+
+          <path id="stairs" style="transform: translate(8px, -16px)" d="
+            M -7 -16.3 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+            m 0 2.75 h 14 v 2.3 h -14 z
+          "/>
+        </g>
+      </g>
+      <g class="building3" style="transform: translate(51.25px, 65.75px)">
+        <use href="#building3"/>
+        <g class="furniture">
+          <use style="transform: translate(2.25px, 23px)" href="#couch"/>
+          <use style="transform: translate(6.5px, -14px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-18.5px, -37px)" href="#dresser"/>
+          <use style="transform: translate(-27px, 37px)" href="#dresser"/>
+          <use style="transform: translate(-25.5px, -17.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(26px, 29.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-13.75px, 16px) rotate(90deg)" href="#desk"/>
+        </g>
+      </g>
+      <g class="building4" style="transform: translate(499px, 96px)">
+        <use style="transform: rotate(180deg)" href="#building4"/>
+        <g class="furniture">
+          <use style="transform: translate(13.5px, 42px)" href="#bed"/>
+          <use style="transform: translate(-11.5px, 51px)" href="#bed"/>
+          <use style="transform: translate(-23px, -51px)" href="#desk"/>
+          <use style="transform: translate(25px, 2.5px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-7px, -29px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(31.5px, -49.25px)" href="#dresser"/>
+          <use style="transform: translate(29px, -29.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(7.5px, -29px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-26.75px, -11px)" href="#dresser"/>
+          <use style="transform: translate(-28px, 16.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(28.75px, 31.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-28px, 48.25px) rotate(90deg)" href="#dresser"/>
+        </g>
+      </g>
+      <g class="building5" style="transform: translate(103px, 294.5px)">
+        <use href="#building5"/>
+        <g class="furniture">
+          <use style="transform: translate(-37px, -17.25px) rotate(90deg)" href="#bed"/>
+          <use style="transform: translate(22px, -17.25px) rotate(90deg)" href="#bed"/>
+          <use style="transform: translate(-41.25px, -.5px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-59.75px, 27px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(-9px, 25.5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(-49.5px, 13.75px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(16.5px, 2.75px)" href="#dresser"/>
+          <use style="transform: translate(34.75px, 2.75px)" href="#dresser"/>
+          <use style="transform: translate(29px, 26px)" href="#dresser"/>
+          <use style="transform: translate(37.5px, -17.25px)" href="#dresser"/>
+          <use style="transform: translate(48.5px, 14px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(65px, -5.5px)" href="#stairs"/>
+        </g>
+      </g>
+      <g class="building6" style="transform: translate(224.5px, 275px)">
+        <use style="transform: rotate(180deg)" href="#building6"/>
+        <g class="furniture">
+          <use style="transform: translate(-9px, 39px)" href="#bed"/>
+          <use style="transform: translate(.5px, 1px) rotate(90deg)" href="#couch"/>
+          <use style="transform: translate(14px, 24.75px)" href="#couch"/>
+          <use style="transform: translate(-10px, -47.75px)" href="#desk"/>
+          <use style="transform: translate(18.5px, -37.25px)" href="#dresser"/>
+          <use style="transform: translate(3px, -13.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-11px, -13.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(8px, 42.5px)" href="#dresser"/>
+        </g>
+      </g>
+      <g class="building7" style="transform: translate(419px, 305.75px)">
+        <use href="#building7"/>
+        <g class="furniture">
+          <use style="transform: translate(-99px, -46.75px)" href="#desk"/>
+          <use style="transform: translate(-106px, 21.25px)" href="#desk"/>
+          <use style="transform: translate(-46.5px, -57.25px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-2.5px, -61.5px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(-2px, -41.5px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(-29.5px, 16.25px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(31.25px, 31px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(53.75px, 32.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(68.25px, 28px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(87px, 31.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(102.5px, 23.5px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(103.5px, -2px) rotate(180deg)" href="#desk"/>
+          <use style="transform: translate(102px, -41.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(101.75px, -59.75px) rotate(90deg)" href="#desk"/>
+
+          <use style="transform: translate(-101.75px, -26.25px) rotate(0deg)" href="#dresser"/>
+          <use style="transform: translate(-71.5px, -36.75px) rotate(0deg)" href="#dresser"/>
+          <use style="transform: translate(-59px, -26px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-62.5px, 17px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(5px, 4.75px)" href="#dresser"/>
+          <use style="transform: translate(11.5px, 20.25px)" href="#dresser"/>
+          <use style="transform: translate(46.25px, -32.5px)" href="#dresser"/>
+          <use style="transform: translate(62.5px, -57px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(71.5px, -29.25px) rotate(90deg)" href="#dresser"/>
+
+          <path class="stairs" style="transform: translate(33.5px, -63.25px) rotate(-90deg)" d="
+            M -5.25 -10.95 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+            m 0 3.3 h 10.5 v 3 h -10.5 z
+          "/>
+        </g>
+      </g>
     </g>
+    <rect id="dots" fill="url(#asterisk)"/>
     <g id="firing-arcs">
       <g id="shapes"/>
       <g id="lines"/>
diff --git a/public/assets/images/map3.svg b/public/assets/images/map3.svg
index 556ad91..1cfddfe 100644
--- a/public/assets/images/map3.svg
+++ b/public/assets/images/map3.svg
@@ -8,12 +8,47 @@
 
     g[data-edge="north"] { --i: -2; }
     g[data-edge="south"] { --i: 26; }
+
+    #background {
+      stroke: #304b75;
+      fill: #bacae3;
+    }
+
+    pattern use {
+      stroke: black;
+      stroke-width: 0.3px;
+    }
+
+    .cw-60-deg {
+      transform: rotate(60deg);
+    }
+
+    .ccw-60-deg {
+      transform: rotate(-60deg);
+    }
   </style>
   <defs>
     <polygon id="hex" points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
-
     <circle id="counter-base" cx="0" cy="0" r="5"/>
 
+    <line id="ast-line" x1="-1.2" y1="0" x2="1.2" y2="0"/>
+
+    <pattern id="asterisk" viewBox="-8.66 -15 17.32 30" width="17.32" height="30" patternUnits="userSpaceOnUse">
+      <use y="-15" href="#ast-line"/>
+      <use y="-15" style="transform-origin: 0 -15px;" class="cw-60-deg" href="#ast-line"/>
+      <use y="-15" style="transform-origin: 0 -15px;" class="ccw-60-deg" href="#ast-line"/>
+      <use y="15" href="#ast-line"/>
+      <use y="15" style="transform-origin: 0 15px;" class="cw-60-deg" href="#ast-line"/>
+      <use y="15" style="transform-origin: 0 15px;" class="ccw-60-deg" href="#ast-line"/>
+
+      <use x="8.66" href="#ast-line"/>
+      <use x="8.66" style="transform-origin: 8.66px 0;" class="cw-60-deg" href="#ast-line"/>
+      <use x="8.66" style="transform-origin: 8.66px 0;" class="ccw-60-deg" href="#ast-line"/>
+      <use x="-8.66" href="#ast-line"/>
+      <use x="-8.66" style="transform-origin: -8.66px 0;" class="cw-60-deg" href="#ast-line"/>
+      <use x="-8.66" style="transform-origin: -8.66px 0;" class="ccw-60-deg" href="#ast-line"/>
+    </pattern>
+
     <g id="t-1" class="troop-counter-template"><use href="#counter-base"/><text>1</text></g>
     <g id="t-2" class="troop-counter-template"><use href="#counter-base"/><text>2</text></g>
     <g id="t-3" class="troop-counter-template"><use href="#counter-base"/><text>3</text></g>
@@ -67,20 +102,66 @@
       "/>
     </g>
 
-    <rect id="background"/>
+    <polygon id="desk" points="-1.5,-7 4.5,-7 4.5,7 -1.5,7 -2.5,6 -2.5,3 -4.5,3 -4.5,-3 -2.5,-3 -2.5,-6"/>
+    <rect id="couch" x="-4.25" y="-8" width="8.5" height="16"/>
+    <rect id="dresser" x="-2.5" y="-4.75" width="5" height="9.5"/>
   </defs>
 
-  <use href="#background"/>
+  <rect id="background"/>
 
-  <g id="image-maps">
+  <!-- <g id="image-maps">
     <image id="map4" class="map-scans" href="scans/map4.jpg" width="2284" height="1518"/>
     <image id="map4" class="map-scans" href="column.jpg" width="24" height="1518" x="2268"/>
-  </g>
+  </g> -->
 
   <g class="gameboard">
-    <g id="buildings">
-      <use x="263.125" y="188.625" href="#building8"/>
+    <g id="svg-map4">
+      <g class="building8" style="transform: translate(263.125px, 188.625px)">
+        <use href="#building8"/>
+        <g class="furniture">
+          <use style="transform: translate(-82px, -84px)" href="#couch"/>
+          <use style="transform: translate(6px, -83.5px)" href="#couch"/>
+          <use style="transform: translate(23px, -84px)" href="#couch"/>
+          <use style="transform: translate(-72px, -8px)" href="#couch"/>
+          <use style="transform: translate(-36.5px, -8px)" href="#couch"/>
+          <use style="transform: translate(-3px, -8px)" href="#couch"/>
+          <use style="transform: translate(-21.5px, 51px)" href="#couch"/>
+
+          <use style="transform: translate(-64px, -60.5px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(48px, -44.5px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(92.5px, -78.75px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-89.5px, 23px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-46px, 42px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-2.5px, 24px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(49.5px, 23.5px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(101.5px, 23.5px) rotate(-90deg)" href="#desk"/>
+          <use style="transform: translate(-90.25px, 56.5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(-90px, 89.5px) rotate(90deg)" href="#desk"/>
+          <use style="transform: translate(110px, 66.5px)" href="#desk"/>
+
+          <use style="transform: translate(-42.25px, -77.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-29.75px, -75.75px)" href="#dresser"/>
+          <use style="transform: translate(6px, -56.75px)" href="#dresser"/>
+          <use style="transform: translate(23.5px, -56.75px)" href="#dresser"/>
+          <use style="transform: translate(-76px, -36px)" href="#dresser"/>
+          <use style="transform: translate(-52.75px, -36px)" href="#dresser"/>
+          <use style="transform: translate(-12.75px, -34px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(74.5px, -34.5px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-73.5px, 13px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-38px, 13.25px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-112.5px, 59px)" href="#dresser"/>
+          <use style="transform: translate(-112.75px, 94px)" href="#dresser"/>
+          <use style="transform: translate(-81.75px, 104px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-65.25px, 68.5px)" href="#dresser"/>
+          <use style="transform: translate(-47.75px, 104px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(-30px, 67px)" href="#dresser"/>
+          <use style="transform: translate(31px, 51px) rotate(90deg)" href="#dresser"/>
+          <use style="transform: translate(87.5px, 58px)" href="#dresser"/>
+
+        </g>
+      </g>
     </g>
+    <rect id="dots" fill="url(#asterisk)"/>
     <g id="firing-arcs">
       <g id="shapes"/>
       <g id="lines"/>