diff --git a/src/main/java/com/ntlab/irisserver/entities/Member.java b/src/main/java/com/ntlab/irisserver/entities/Member.java
index 9f60674..1afa6df 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Member.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Member.java
@@ -16,8 +16,6 @@
 
     //-----------------------------------------------------------------
     //コンストラクト
-    public Member() {}
-
     public Member(String nickname) {
         this.nickname = nickname;
         this.belongs = "n";
@@ -38,5 +36,5 @@
 
     public String getBelongs() {return this.belongs;}
 
-    public boolean getMaster() {return this.master;}
+    public boolean isMaster() {return this.master;}
 }
diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java
index 86f61e3..d2d6d3d 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Room.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Room.java
@@ -1,5 +1,35 @@
 package com.ntlab.irisserver.entities;
 
-public class Room {
+import java.util.HashMap;
+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;
+
+        Map<String,Member> members= new HashMap<>();
+
+
+        public Member getMembers(String nick) {
+                Member m = members.get(nick);
+                return m;
+
+        }
+
+        public Member getMember(String nick) {
+                Member m = new Member(nick);
+                return m;
+        }
+
+        public void addMember(String nick){
+                Member m=new Member(nick);
+                m.setNickname(nick);
+                members.put(nick,m);
+        }
 }