diff --git a/lesson_23/api/java/api_app/src/main/java/com/codedifferently/lesson23/web/MediaItemsController.java b/lesson_23/api/java/api_app/src/main/java/com/codedifferently/lesson23/web/MediaItemsController.java
index 7efa0b2f8..7c7b09427 100644
--- a/lesson_23/api/java/api_app/src/main/java/com/codedifferently/lesson23/web/MediaItemsController.java
+++ b/lesson_23/api/java/api_app/src/main/java/com/codedifferently/lesson23/web/MediaItemsController.java
@@ -4,12 +4,18 @@
 import com.codedifferently.lesson23.library.Library;
 import com.codedifferently.lesson23.library.MediaItem;
 import com.codedifferently.lesson23.library.search.SearchCriteria;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -31,4 +37,60 @@ public ResponseEntity<GetMediaItemsResponse> getItems() {
     var response = GetMediaItemsResponse.builder().items(responseItems).build();
     return ResponseEntity.ok(response);
   }
+
+  @PostMapping("/items")
+  public ResponseEntity<CreateMediaItemResponse> addItem(
+      @Valid @RequestBody CreateMediaItemRequest request) {
+    try {
+      MediaItem mediaItem = MediaItemRequest.asMediaItem(request.getItem());
+      library.addMediaItem(mediaItem, librarian);
+      CreateMediaItemResponse response =
+          CreateMediaItemResponse.builder().item(MediaItemResponse.from(mediaItem)).build();
+      return ResponseEntity.ok(response);
+    } catch (Exception e) {
+      return ResponseEntity.badRequest().build();
+    }
+  }
+
+  @GetMapping("/items/{id}")
+  public ResponseEntity<MediaItemResponse> getItem(@PathVariable String id) {
+    UUID uuid;
+    try {
+      uuid = UUID.fromString(id);
+    } catch (IllegalArgumentException e) {
+      return ResponseEntity.badRequest().build();
+    }
+    SearchCriteria criteria = new SearchCriteria();
+    criteria.id = uuid.toString();
+    Set<MediaItem> items = library.search(criteria);
+    MediaItem item = items.stream().findFirst().orElse(null);
+    if (item == null) {
+      return ResponseEntity.notFound().build();
+    }
+    MediaItemResponse response = MediaItemResponse.from(item);
+    return ResponseEntity.ok(response);
+  }
+
+  @DeleteMapping("/items/{id}")
+  public ResponseEntity<Void> deleteItem(@PathVariable String id) {
+    UUID uuid;
+    try {
+      uuid = UUID.fromString(id);
+    } catch (IllegalArgumentException e) {
+      return ResponseEntity.badRequest().build();
+    }
+    SearchCriteria criteria = new SearchCriteria();
+    criteria.id = uuid.toString();
+    Set<MediaItem> items = library.search(criteria);
+    MediaItem item = items.stream().findFirst().orElse(null);
+    if (item == null) {
+      return ResponseEntity.notFound().build();
+    }
+    try {
+      library.removeMediaItem(uuid, librarian);
+    } catch (Exception e) {
+      return ResponseEntity.status(409).build();
+    }
+    return ResponseEntity.noContent().build();
+  }
 }