diff --git a/lesson_26/api/java/api_app/src/main/java/com/codedifferently/lesson26/web/MediaItemsController.java b/lesson_26/api/java/api_app/src/main/java/com/codedifferently/lesson26/web/MediaItemsController.java
index bbbc45e41..56a584e79 100644
--- a/lesson_26/api/java/api_app/src/main/java/com/codedifferently/lesson26/web/MediaItemsController.java
+++ b/lesson_26/api/java/api_app/src/main/java/com/codedifferently/lesson26/web/MediaItemsController.java
@@ -5,17 +5,26 @@
 import com.codedifferently.lesson26.library.MediaItem;
 import com.codedifferently.lesson26.library.search.SearchCriteria;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("/items")
 @CrossOrigin
 public class MediaItemsController {
-
   private final Library library;
   private final Librarian librarian;
 
@@ -24,11 +33,80 @@ public MediaItemsController(Library library) throws IOException {
     this.librarian = library.getLibrarians().stream().findFirst().orElseThrow();
   }
 
-  @GetMapping("/items")
-  public ResponseEntity<GetMediaItemsResponse> getItems() {
+  @GetMapping()
+  public ResponseEntity<GetMediaItemsResponse> getItemById() {
     Set<MediaItem> items = library.search(SearchCriteria.builder().build());
+    if (items.isEmpty()) {
+      ResponseEntity.noContent();
+    }
     List<MediaItemResponse> responseItems = items.stream().map(MediaItemResponse::from).toList();
     var response = GetMediaItemsResponse.builder().items(responseItems).build();
     return ResponseEntity.ok(response);
   }
+
+  @GetMapping(value = "/{id}")
+  public ResponseEntity<MediaItemResponse> getItemById(@PathVariable("id") UUID id) {
+
+    System.out.println(id.toString());
+
+    Set<MediaItem> items = library.search(SearchCriteria.builder().id(id.toString()).build());
+    Optional<MediaItem> matchedItem =
+        items.stream().filter(item -> item.getId().equals(id)).findFirst();
+    System.out.println("items");
+    System.out.println(items);
+    System.out.println(matchedItem);
+    System.out.println("mathcedItems");
+    return matchedItem
+        .map(
+            item -> {
+              MediaItemResponse responseItem = MediaItemResponse.from(item);
+              return ResponseEntity.ok(responseItem);
+            })
+        .orElse(ResponseEntity.notFound().build());
+  }
+
+  @PostMapping()
+  public ResponseEntity<?> postItems(@RequestBody CreateMediaItemRequest requestBody) {
+    List<String> errorsList = new ArrayList<>();
+    MediaItemRequest request = requestBody.getItem();
+    if (requestBody.getItem() == null) {
+      errorsList.add("Cannot enter null");
+    } else {
+      if ((request.getTitle() == null || request.getTitle().isBlank())
+          && (request.getType() == null || request.getType().isBlank())) {
+        errorsList.add("title and type cannot be null or blank");
+      } else {
+        if (request.getTitle() == null || request.getTitle().isBlank()) {
+          errorsList.add("title cannot be null or blank");
+        } else {
+          if (request.getType() == null || request.getType().isBlank()) {
+            errorsList.add("type cannot be null or blank");
+          }
+        }
+      }
+    }
+    if (!errorsList.isEmpty()) {
+      return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+          .body(
+              new Object() {
+                public final List<String> errors = errorsList;
+              });
+    }
+    MediaItem newMediaItem = MediaItemRequest.asMediaItem(request);
+    library.addMediaItem(newMediaItem, librarian);
+    return ResponseEntity.ok(requestBody);
+  }
+
+  @DeleteMapping(value = "/{id}")
+  public ResponseEntity<Void> deleteItem(@PathVariable("id") UUID id) {
+    Set<MediaItem> test1 = library.search(SearchCriteria.builder().build());
+    Set<MediaItem> item = library.search(SearchCriteria.builder().id(id.toString()).build());
+    if (item.isEmpty()) {
+      return ResponseEntity.notFound().build();
+    } else if (!test1.contains(item.iterator().next()) || item.iterator().next() == null) {
+      return ResponseEntity.notFound().build();
+    }
+    library.removeMediaItem(id, librarian);
+    return ResponseEntity.noContent().build();
+  }
 }