diff --git a/src/main/java/com/ntlab/irisserver/entities/Member.java b/src/main/java/com/ntlab/irisserver/entities/Member.java
index 1afa6df..68fc6ff 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Member.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Member.java
@@ -23,7 +23,7 @@
     }
 
     //-----------------------------------------------------------------
-    // setter
+    // setter0
     public void setNickname(String nickname) {this.nickname = nickname;}
 
     public void setBelongs(String belongs) {this.belongs = belongs;}
diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java
index d815e53..b0c6d02 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Room.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Room.java
@@ -1,21 +1,49 @@
 package com.ntlab.irisserver.entities;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class Room {
-        String rid = null;
-        int state;
-        String ownerName = null;
-        boolean drawingTimer;
-        int drawingTimerTimes;
-        boolean gameTimer;
-        int gameTimerTimes;
-        int gameTimerFirstThinkingTimes;
+        @JsonProperty("rid")
+        public String rid;
+        //String rid = null;
+
+        @JsonProperty("state")
+        public int state;
+        //int state;
+
+        @JsonProperty("ownerName")
+        public String ownerName;
+        //String ownerName = null;
+
+        @JsonProperty("drawingTimer")
+        public boolean drawingTimer;
+        //boolean drawingTimer;
+
+        @JsonProperty("drawingTimerTimes")
+        public int drawingTimerTimes;
+        //int drawingTimerTimes;
+
+        @JsonProperty("gameTimer")
+        public boolean gameTimer;
+        //boolean gameTimer;
+
+        @JsonProperty("gameTimerTimes")
+        public int gameTimerTimes;
+        //int gameTimerTimes;
+
+        @JsonProperty("gameTimerFirstThinkingTimes")
+        public int gameTimerFirstThinkingTimes;
+        //int gameTimerFirstThinkingTimes;
+
+
 
         Map<String,Member> members= new HashMap<>();
+        Map<Integer, Drawing> drawings = new HashMap<>();
 
 
         public List<Member> getMembers() {
@@ -25,6 +53,10 @@
 
         }
 
+        public void changeTeamAndMaster(String nick, String belongs, boolean isMaster) {
+
+        }
+
         public Member getMember(String nick) {
                 Member m = members.get(nick);
                 return m;
@@ -38,6 +70,66 @@
         public int getStateRest(){
                 return 0;
         }
-        public Room(String rid, String owner) {
+
+        public Room(){
+                drawingTimer = false;
+                drawingTimerTimes = 0;
+                gameTimer = true;
+                gameTimerTimes = 30;
+                gameTimerFirstThinkingTimes = 10;
         }
+
+        public Room(String rid, String owner) {
+                this.rid=rid;
+                ownerName=owner;
+        }
+        public Drawing getDrawing(int dno) {
+                return drawings.get(dno);
+        }
+
+        public void putDrawing(int dno, Drawing d) {
+                drawings.put(dno, d);
+        }
+
+        public void setDrawingTimer(boolean drawingTimer) {
+                this.drawingTimer = drawingTimer;
+        }
+
+        public void setDrawingTimerTimes(int drawingTimerTimes) {
+                this.drawingTimerTimes = drawingTimerTimes;
+        }
+
+        public void setGameTimer(boolean gameTimer) {
+                this.gameTimer = gameTimer;
+        }
+
+        public void setGameTimerTimes(int gameTimerTimes) {
+                this.gameTimerTimes = gameTimerTimes;
+        }
+
+        public void setGameTimerFirstThinkingTimes(int gameTimerFirstThinkingTimes) {
+                this.gameTimerFirstThinkingTimes = gameTimerFirstThinkingTimes;
+        }
+
+        public boolean isDrawingTimer() {
+                return drawingTimer;
+        }
+
+        public int getDrawingTimerTimes() {
+                return drawingTimerTimes;
+        }
+
+        public boolean isGameTimer() {
+                return gameTimer;
+        }
+
+        public int getGameTimerTimes() {
+                return gameTimerTimes;
+        }
+
+        public int getGameTimerFirstThinkingTimes() {
+                return gameTimerFirstThinkingTimes;
+        }
+
+
 }