diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java b/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java
index df0b6b6..140d96d 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/Stroke.java
@@ -2,17 +2,43 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import org.ntlab.acanthus_server.resources.gallery.StrokesRest;
+import org.ntlab.acanthus_server.entities.Position;
 
 public class Stroke {
-    private HashMap<String, Integer> strokeMap = new HashMap<>();
-    private ArrayList<HashMap<String, Integer>> strokeList = new ArrayList<>();
+    private int pen;
+    private int color;
+    private int thickness;
+    private ArrayList<Position> positions = new ArrayList<>();
 
-    public void putStroke(String type, Integer value) {
-        this.strokeMap.put(type, value);
+    public int getPen() {
+        return this.pen;
+    }
+    public int getColor() {
+        return this.color;
+    }
+    public int getThickness() {
+        return this.thickness;
     }
 
-    public ArrayList<HashMap<String, Integer>> getStrokeRest() {
-        this.strokeList.add(this.strokeMap);
-        return this.strokeList;
+    public void setStrokes(int pen, int color, int thickness) {
+        this.pen = pen;
+        this.color = color;
+        this.thickness = thickness;
     }
+
 }
+
+
+
+//    private ArrayList<HashMap<String, Integer>> strokeList = new ArrayList<>();
+//
+//    public void putStroke(String type, Integer value) {
+//        this.strokeMap.put(type, value);
+//    }
+//
+//    public ArrayList<HashMap<String, Integer>> getStrokeRest() {
+//        this.strokeList.add(this.strokeMap);
+//        return this.strokeList;
+//    }
+//}
diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java
index c0cb115..8620b88 100644
--- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java
+++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java
@@ -29,12 +29,8 @@
     @Path("/{aid}/pageMap/0/layers/0/strokes")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public ArrayList<HashMap<String, Integer>> getStrokeRest(@PathParam("aid") Integer aid) {
-        this.Test.putStroke("strokeNo", 2);
-        this.Test.putStroke("pen", 3);
-        this.Test.putStroke("color", 5);
-        this.Test.putStroke("thickness", 1);
-        return this.Test.getStrokeRest();
+    public Stroke getStrokeRest(@PathParam("aid") Integer aid) {
+        return this.Test;
     }
 
     /*
@@ -49,9 +45,9 @@
     @Path("/{aid}/pageMap/0/layers/0/strokes")
     @POST
     @Produces(MediaType.APPLICATION_JSON)
-    public String addStrokes(@PathParam("aid") Integer aid, @FormParam("uid") Integer uid, @FormParam("uidToken") Integer uidToken,
+    public void addStrokes(@PathParam("aid") Integer aid, @FormParam("uid") Integer uid, @FormParam("uidToken") Integer uidToken,
                              @FormParam("pen") Integer pen, @FormParam("color") Integer color, @FormParam("thick") Integer thick) {
-        return null;
+        this.Test.setStrokes(pen, color, thick);
     }
 
     /*