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..f6517b9d5 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
@@ -1,17 +1,27 @@
 package com.codedifferently.lesson23.web;
 
-import com.codedifferently.lesson23.library.Librarian;
-import com.codedifferently.lesson23.library.Library;
-import com.codedifferently.lesson23.library.MediaItem;
-import com.codedifferently.lesson23.library.search.SearchCriteria;
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
+
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindingResult;
 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;
 
+import com.codedifferently.lesson23.library.Librarian;
+import com.codedifferently.lesson23.library.Library;
+import com.codedifferently.lesson23.library.MediaItem;
+import com.codedifferently.lesson23.library.search.SearchCriteria;
+
+import jakarta.validation.Valid;
+
 @RestController
 @CrossOrigin
 public class MediaItemsController {
@@ -31,4 +41,60 @@ public ResponseEntity<GetMediaItemsResponse> getItems() {
     var response = GetMediaItemsResponse.builder().items(responseItems).build();
     return ResponseEntity.ok(response);
   }
+
+  @GetMapping("/items/{id}")
+  public ResponseEntity<MediaItemResponse> getItem(@PathVariable String id) {
+    try {
+      UUID itemId = UUID.fromString(id);
+      Set<MediaItem> items = library.search(SearchCriteria.builder().id(itemId.toString()).build());
+      
+      if (items.isEmpty()) {
+        return ResponseEntity.notFound().build();
+      }
+      
+      MediaItem item = items.iterator().next();
+      MediaItemResponse response = MediaItemResponse.from(item);
+      return ResponseEntity.ok(response);
+    } catch (IllegalArgumentException e) {
+      return ResponseEntity.notFound().build();
+    }
+  }
+
+  @PostMapping("/items")
+  public ResponseEntity<?> createItem(@Valid @RequestBody CreateMediaItemRequest request, BindingResult bindingResult) {
+    if (bindingResult.hasErrors()) {
+      List<String> errors = bindingResult.getFieldErrors().stream()
+          .map(error -> error.getDefaultMessage())
+          .toList();
+      return ResponseEntity.badRequest().body(new ValidationErrorResponse(errors));
+    }
+
+    try {
+      MediaItem item = MediaItemRequest.asMediaItem(request.getItem());
+      library.addMediaItem(item, librarian);
+      MediaItemResponse response = MediaItemResponse.from(item);
+      return ResponseEntity.ok(CreateMediaItemResponse.builder().item(response).build());
+    } catch (Exception e) {
+      return ResponseEntity.badRequest().build();
+    }
+  }
+
+  @DeleteMapping("/items/{id}")
+  public ResponseEntity<Void> deleteItem(@PathVariable String id) {
+    try {
+      UUID itemId = UUID.fromString(id);
+      Set<MediaItem> items = library.search(SearchCriteria.builder().id(itemId.toString()).build());
+      
+      if (items.isEmpty()) {
+        return ResponseEntity.notFound().build();
+      }
+      
+      library.removeMediaItem(itemId, librarian);
+      return ResponseEntity.noContent().build();
+    } catch (IllegalArgumentException e) {
+      return ResponseEntity.notFound().build();
+    } catch (Exception e) {
+      return ResponseEntity.badRequest().build();
+    }
+  }
 }
diff --git a/lesson_23/api/java/api_app/src/main/java/com/codedifferently/lesson23/web/ValidationErrorResponse.java b/lesson_23/api/java/api_app/src/main/java/com/codedifferently/lesson23/web/ValidationErrorResponse.java
new file mode 100644
index 000000000..70aa233d7
--- /dev/null
+++ b/lesson_23/api/java/api_app/src/main/java/com/codedifferently/lesson23/web/ValidationErrorResponse.java
@@ -0,0 +1,17 @@
+package com.codedifferently.lesson23.web;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ValidationErrorResponse {
+
+  private List<String> errors;
+}