diff --git a/src/main/java/de/fuberlin/imp/memorybox/restmembox/controller/MemoryBoxController.java b/src/main/java/de/fuberlin/imp/memorybox/restmembox/controller/MemoryBoxController.java
deleted file mode 100644
index 6aae533cc9a136d41eab4c738fd20a3351ce82fe..0000000000000000000000000000000000000000
--- a/src/main/java/de/fuberlin/imp/memorybox/restmembox/controller/MemoryBoxController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.fuberlin.imp.memorybox.restmembox.controller;
-
-import de.fuberlin.imp.memorybox.restmembox.model.MemoryBox;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/memorybox")
-public class MemoryBoxController {
-
-    private static final String REQUEST_PARAM_ID = "id";
-
-    public MemoryBox memoryBox(@RequestParam(value=REQUEST_PARAM_ID, defaultValue = "0") long id) {
-        return new MemoryBox(id);
-    }
-
-}
diff --git a/src/main/java/de/fuberlin/imp/memorybox/restmembox/model/Memory.java b/src/main/java/de/fuberlin/imp/memorybox/restmembox/model/Memory.java
new file mode 100644
index 0000000000000000000000000000000000000000..8006db86a5247ac4779cbf4fff78d93ebded9026
--- /dev/null
+++ b/src/main/java/de/fuberlin/imp/memorybox/restmembox/model/Memory.java
@@ -0,0 +1,32 @@
+package de.fuberlin.imp.memorybox.restmembox.model;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.time.LocalDate;
+
+@Data
+@Entity
+public class Memory {
+
+    @Id
+    @GeneratedValue()
+    private long id;
+    private final LocalDate creationDate;
+    private boolean published;
+
+    // gps location
+    // user?
+
+    private byte[] voice;
+    private String voiceText;
+    private byte[] image;
+    private String note; // optional Text
+
+    public Memory() {
+        this.creationDate = LocalDate.now();
+        this.published = false;
+    }
+}
diff --git a/src/main/java/de/fuberlin/imp/memorybox/restmembox/model/MemoryBox.java b/src/main/java/de/fuberlin/imp/memorybox/restmembox/model/MemoryBox.java
deleted file mode 100644
index b134142b34102506fceab441d0686223c3c4e9e2..0000000000000000000000000000000000000000
--- a/src/main/java/de/fuberlin/imp/memorybox/restmembox/model/MemoryBox.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package de.fuberlin.imp.memorybox.restmembox.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDate;
-
-public class MemoryBox {
-
-    @Getter
-    private final long id;
-
-    @Getter
-    @Setter
-    private String name;
-
-    @Getter
-    private final LocalDate creationDate;
-
-    @Getter
-    @Setter
-    private String memory; // demo
-
-    /*
-    // for later - how this might look like
-
-    @Getter
-    @Setter
-    private MemoryBox memoryBox;
-    */
-    public MemoryBox(long id) {
-        this.id = id;
-        this.creationDate = LocalDate.now();
-    }
-}
diff --git a/src/main/java/de/fuberlin/imp/memorybox/restmembox/repository/MemoryRepository.java b/src/main/java/de/fuberlin/imp/memorybox/restmembox/repository/MemoryRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c1f89bd7edc4a684688f2064fc01a855c02fae9
--- /dev/null
+++ b/src/main/java/de/fuberlin/imp/memorybox/restmembox/repository/MemoryRepository.java
@@ -0,0 +1,11 @@
+package de.fuberlin.imp.memorybox.restmembox.repository;
+
+import de.fuberlin.imp.memorybox.restmembox.model.Memory;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+@RepositoryRestResource
+public interface MemoryRepository extends PagingAndSortingRepository<Memory, Long> {
+
+}