diff --git a/lesson_16/api/api_app/src/main/java/com/codedifferently/lesson16/web/MediaItemsController.java b/lesson_16/api/api_app/src/main/java/com/codedifferently/lesson16/web/MediaItemsController.java
index cae5ff06..b75bdd6c 100644
--- a/lesson_16/api/api_app/src/main/java/com/codedifferently/lesson16/web/MediaItemsController.java
+++ b/lesson_16/api/api_app/src/main/java/com/codedifferently/lesson16/web/MediaItemsController.java
@@ -1,14 +1,26 @@
 package com.codedifferently.lesson16.web;
 
-import com.codedifferently.lesson16.library.Librarian;
-import com.codedifferently.lesson16.library.Library;
-import com.codedifferently.lesson16.library.MediaItem;
-import com.codedifferently.lesson16.library.search.SearchCriteria;
 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.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 org.springframework.web.server.ResponseStatusException;
+
+import com.codedifferently.lesson16.library.Librarian;
+import com.codedifferently.lesson16.library.Library;
+import com.codedifferently.lesson16.library.MediaItem;
+import com.codedifferently.lesson16.library.search.SearchCriteria;
+
+import jakarta.validation.Valid;
 
 @RestController
 public class MediaItemsController {
@@ -27,4 +39,36 @@ public GetMediaItemsResponse getItems() {
     var response = GetMediaItemsResponse.builder().items(responseItems).build();
     return response;
   }
+  
+
+  @PostMapping("/items")
+  public CreateMediaItemResponse postItem(@Valid @RequestBody CreateMediaItemRequest request) {
+    MediaItem item = MediaItemRequest.asMediaItem(request.getItem());
+    library.addMediaItem(item, librarian);
+    var response = CreateMediaItemResponse.builder().item(MediaItemResponse.from(item)).build();
+    return response;
+  }
+
+  @GetMapping("/items/{id}")
+  public GetMediaItemsResponse getItem(@PathVariable String id) {
+    SearchCriteria criteria = SearchCriteria.builder().id(id).build();
+    Set<MediaItem> items = library.search(criteria);
+
+    if (items.isEmpty()) {
+      throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Media item not found");
+    }
+
+    List<MediaItemResponse> responseItems = items.stream().map(MediaItemResponse::from).toList();
+    return GetMediaItemsResponse.builder().items(responseItems).build();
+  }
+
+  @DeleteMapping("/items/{id}")
+  public ResponseEntity<Void> deleteItem(@PathVariable String id) {
+    if (!library.hasMediaItem(UUID.fromString(id))) {
+      throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Media item not found");
+    }
+
+    library.removeMediaItem(UUID.fromString(id), librarian);
+    return ResponseEntity.noContent().build();
+  }
 }