diff --git a/src/main/java/org/ntlab/amaryllis/server/resources/VoicememosRest.java b/src/main/java/org/ntlab/amaryllis/server/resources/VoicememosRest.java
index f662604..da8eede 100644
--- a/src/main/java/org/ntlab/amaryllis/server/resources/VoicememosRest.java
+++ b/src/main/java/org/ntlab/amaryllis/server/resources/VoicememosRest.java
@@ -1,37 +1,61 @@
 package org.ntlab.amaryllis.server.resources;
 
+import org.ntlab.amaryllis.server.entities.Account;
+import org.ntlab.amaryllis.server.entities.Voicememo;
+import org.ntlab.amaryllis.server.models.Accounts;
+import org.ntlab.amaryllis.server.models.Voicememos;
 import org.springframework.stereotype.Component;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import java.awt.*;
 import java.util.ArrayList;
+import java.util.UUID;
 
 @Component
 @Path("/voicememos")
 public class VoicememosRest {
+    Voicememos voicememos = Voicememos.getInstance();
+    Accounts accounts = Accounts.getInstance();
 
     @GET
-    public String getVoicememos(@FormParam("latmax") double latmax, @FormParam("latmin") double latmin, @FormParam("longmax") double longmax, @FormParam("longmin") double longmin) {
-        String voicememos = "";
-        return voicememos;
+    public String getVoicememos(@QueryParam("latmax") double latmax, @QueryParam("latmin") double latmin, @QueryParam("longmax") double longmax, @QueryParam("longmin") double longmin) {
+        String vidlist = "";
+//        for (Voicememo v :
+//                voicememos) {
+//            String vid = v.getVid();
+//            double latitude = v.getLatitude();
+//            double longitude = v.getLongitude();
+//            if (latmax > latitude && latitude > latmin && longmax > longitude && longmin > longitude) {
+//                vidlist = vidlist + vid;
+//            }
+//        }
+        return vidlist;
     }
 
     @POST
-    public String addVoicememos(@FormParam("uid") String uid) {
-        String vid = "123";
-        return vid;
+    public String addVoicememos(@FormParam("token") String client_token, @FormParam("uid") String uid, @FormParam("time") int time, @FormParam("data") String data, @FormParam("latitude") double latitude, @FormParam("longitude") double longitude, @FormParam("title") String title, @FormParam("summary") String summary) {
+        String vid = "";
+        Account account = accounts.getAccount(uid);
+        String server_token = account.getToken();
+        if (client_token == server_token) {
+            UUID uuid = UUID.randomUUID();
+            vid = uuid.toString();
+            voicememos.createVoicememo(uid, time, data, latitude, longitude, title, summary);
+            return vid;
+        }
+        return null;
     }
 
     @Path("/{vid}")
     @GET
-    public String getVoicememo(){
-        String voicememo="";
+    public String getVoicememo() {
+        String voicememo = "";
         return voicememo;
     }
 
     @PUT
-    public void correctVicememo(){
+    public void correctVicememo() {
 
     }