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..89b65fb4f 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
@@ -3,13 +3,21 @@
 import com.codedifferently.lesson23.library.Librarian;
 import com.codedifferently.lesson23.library.Library;
 import com.codedifferently.lesson23.library.MediaItem;
+import com.codedifferently.lesson23.library.exceptions.MediaItemCheckedOutException;
 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.HttpStatus;
 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 +39,45 @@ 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) {
+    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);
+  }
+
+  @PostMapping("/items")
+  public ResponseEntity<CreateMediaItemResponse> createItem(
+      @Valid @RequestBody CreateMediaItemRequest request) {
+    MediaItem mediaItem = MediaItemRequest.asMediaItem(request.getItem());
+    library.addMediaItem(mediaItem, librarian);
+
+    MediaItemResponse responseItem = MediaItemResponse.from(mediaItem);
+    CreateMediaItemResponse response = CreateMediaItemResponse.builder().item(responseItem).build();
+    return ResponseEntity.ok(response);
+  }
+
+  @DeleteMapping("/items/{id}")
+  public ResponseEntity<Void> deleteItem(@PathVariable String id) {
+    UUID itemId = UUID.fromString(id);
+
+    if (!library.hasMediaItem(itemId)) {
+      return ResponseEntity.notFound().build();
+    }
+
+    try {
+      library.removeMediaItem(itemId, librarian);
+      return ResponseEntity.noContent().build();
+    } catch (MediaItemCheckedOutException e) {
+      return ResponseEntity.status(HttpStatus.CONFLICT).build();
+    }
+  }
 }