diff --git a/assets/Data/menu/room/roomToolConfig.html b/assets/Data/menu/room/roomToolConfig.html
index baf0640f..88da6572 100644
--- a/assets/Data/menu/room/roomToolConfig.html
+++ b/assets/Data/menu/room/roomToolConfig.html
@@ -12,9 +12,9 @@ mainPanel {
 </style>
 <div class="mainPanel">
     <p class="testClass">Room Tool Menu!</p>
-    <button onclick="hook('ROOM_TOOL_TOGGLE')">Select Rooms</button>
-    <button onclick="hook('ROOM_TOOL_TOGGLE')">Show Rooms</button>
-    <button onclick="hook('ROOM_TOOL_TOGGLE')">Select Furniture Spots</button>
-    <button onclick="hook('ROOM_TOOL_TOGGLE')">Show Furniture Spots</button>
-    <button onclick="engine.playerState.controlState.roomTool.updateState('Detect Room')">Detect Room</button>
+    <button onclick="engine.playerState.controlState.roomTool.updateState('SelectRoom')">Select Rooms</button>
+    <button onclick="engine.playerState.controlState.roomTool.updateState('ShowRoom')">Show Rooms</button>
+    <button onclick="engine.playerState.controlState.roomTool.updateState('SelectFurniture')">Select Furniture Spots</button>
+    <button onclick="engine.playerState.controlState.roomTool.updateState('ShowFurniture')">Show Furniture Spots</button>
+    <button onclick="engine.playerState.controlState.roomTool.updateState('DetectRoom')">Detect Room</button>
 </div>
\ No newline at end of file
diff --git a/assets/Scripts/client/clienthooks.ts b/assets/Scripts/client/clienthooks.ts
index 51c7ae07..95760247 100644
--- a/assets/Scripts/client/clienthooks.ts
+++ b/assets/Scripts/client/clienthooks.ts
@@ -63,7 +63,19 @@ export const clientHooks: Hook[] = [
     {
         signal: "ROOM_TOOL_ACTION",
         callback: (engine: Engine) => {
-            engine.classes.areaUtils.static.selectAreaRectangular()
+            switch(engine.playerState.controlState.roomTool.currentState){
+                case 'DetectRoom': {
+                } break;
+                case 'SelectFurniture': {
+                } break;
+                case 'SelectRoom': {
+                    engine.classes.areaUtils.static.selectAreaRectangular()
+                } break;
+                case 'ShowFurniture': {
+                } break;
+                case 'ShowRoom': {
+                } break;
+            }
         }
     },
     {
diff --git a/assets/Scripts/client/player/player.ts b/assets/Scripts/client/player/player.ts
index 28382f3d..0859f1ae 100644
--- a/assets/Scripts/client/player/player.ts
+++ b/assets/Scripts/client/player/player.ts
@@ -18,14 +18,14 @@ export class RoomToolState {
     /**
      * The currently selected functionality of the room tool
      */
-    currentState: number = 0
+    currentState: 'SelectRoom' | 'ShowRoom' | 'SelectFurniture' | 'ShowFurniture' | 'DetectRoom' = 'SelectRoom'
 
     /**
      * Updates the state of the room tool
      * @param value The new value
      */
-    updateState(value: string){
-        console.log(value)
+    updateState(value: 'SelectRoom' | 'ShowRoom' | 'SelectFurniture' | 'ShowFurniture' | 'DetectRoom'){
+        this.currentState = value
     }
 }