diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Category.java b/src/main/java/org/ntlab/amaryllis/server/entities/Category.java
new file mode 100644
index 0000000..06a0dd4
--- /dev/null
+++ b/src/main/java/org/ntlab/amaryllis/server/entities/Category.java
@@ -0,0 +1,18 @@
+package org.ntlab.amaryllis.server.entities;
+
+import static java.util.UUID.randomUUID;
+
+public class Category {
+    String categoryId;
+    String categoryName;
+
+    public Category(String categoryName) {
+        this.categoryId = randomUUID().toString();
+        this.categoryId = categoryName;
+    }
+
+    public void setCategory(String categoryId){
+        this.categoryName = categoryId;
+    }
+
+}
diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java b/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
index 902f2a6..137d4e6 100644
--- a/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
+++ b/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
@@ -22,7 +22,7 @@
     private ArrayList<String> categories;
     private ArrayList<Comment> comments;
 
-    public Voicememo(String vid, String uid, Integer time, String data, double latitude, double longitude, String title, String summary) {
+    public Voicememo(String vid, String uid, Integer time, String url, double latitude, double longitude, String title, String summary) {
 
         Calendar upload = Calendar.getInstance();
 
@@ -30,7 +30,7 @@
         setUid(uid);
         setUpload(upload);
         setTime(time);
-        setData(data);
+        setData(url);
         setLatitude(latitude);
         setLongitude(longitude);
         setTitle(title);
@@ -84,8 +84,8 @@
         return data;
     }
 
-    private void setData(String data) {
-        this.data = data;
+    private void setData(String url) {
+        this.data = url;
     }
 
     public double getLatitude() {
diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Categories.java b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java
new file mode 100644
index 0000000..392ee5f
--- /dev/null
+++ b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java
@@ -0,0 +1,6 @@
+package org.ntlab.amaryllis.server.models;
+
+public class Categories {
+
+
+}
diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
index d6a3283..c714c53 100644
--- a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
+++ b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
@@ -20,7 +20,7 @@
         return theInstance;
     }
 
-    private static String createVid() {
+    public static String createVid() {
         String vid = UUID.randomUUID().toString();
         return vid;
     }
@@ -39,14 +39,12 @@
     }
 
 
-    public Voicememo createVoicememo(String uid, Integer time, String data, double latitude, double longitude, String title, String summary) {
-        if (uid == null || time == null || data == null || title == null) {
+    public Voicememo createVoicememo(String vid, String uid, Integer time, String url, double latitude, double longitude, String title, String summary) {
+        if (vid == null || uid == null || time == null || url == null || title == null) {
             return null;
         }
 
-        String vid = createVid();
-
-        Voicememo newVoicememo = new Voicememo(vid, uid, time, data, latitude, longitude, title, summary);
+        Voicememo newVoicememo = new Voicememo(vid, uid, time, url, latitude, longitude, title, summary);
         voicememos.add(newVoicememo);
         return newVoicememo;