diff --git a/lesson_26/api/java/api_app/build.gradle.kts b/lesson_26/api/java/api_app/build.gradle.kts
index ac0c0e680..a282111f8 100644
--- a/lesson_26/api/java/api_app/build.gradle.kts
+++ b/lesson_26/api/java/api_app/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
     id("com.diffplug.spotless") version "6.25.0"
 	  id("org.springframework.boot") version "3.4.0"
     id("com.adarshr.test-logger") version "4.0.0"
-    id("io.freefair.lombok") version "8.6"
 }
 
 apply(plugin = "io.spring.dependency-management")
@@ -39,6 +38,10 @@ dependencies {
     implementation("org.apache.commons:commons-csv:1.10.0")
     implementation("org.xerial:sqlite-jdbc:3.36.0")
     implementation("org.hibernate.orm:hibernate-community-dialects:6.2.7.Final") 
+    compileOnly("org.projectlombok:lombok:1.18.38")
+    annotationProcessor("org.projectlombok:lombok:1.18.38")
+    testCompileOnly("org.projectlombok:lombok:1.18.38")
+    testAnnotationProcessor("org.projectlombok:lombok:1.18.38")
 }
 
 application {
@@ -76,4 +79,4 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     // fix formatting of type annotations
     formatAnnotations()
   }
-}
\ No newline at end of file
+}
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..9e0da7494 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
@@ -7,15 +7,19 @@
 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
 @CrossOrigin
 public class MediaItemsController {
-
   private final Library library;
   private final Librarian librarian;
 
@@ -31,4 +35,44 @@ public ResponseEntity<GetMediaItemsResponse> getItems() {
     var response = GetMediaItemsResponse.builder().items(responseItems).build();
     return ResponseEntity.ok(response);
   }
+
+  @GetMapping("/items/{id}")
+  public ResponseEntity<MediaItemResponse> getItemById(@PathVariable UUID id) {
+    SearchCriteria criteria = SearchCriteria.builder().id(id.toString()).build();
+    Set<MediaItem> items = library.search(criteria);
+
+    if (items.isEmpty()) {
+      return ResponseEntity.notFound().build();
+    } else {
+      MediaItem item = items.iterator().next();
+      MediaItemResponse response = MediaItemResponse.from(item);
+      return ResponseEntity.ok(response);
+    }
+  }
+
+  @PostMapping("/items")
+  public CreateMediaItemResponse addItem(@RequestBody CreateMediaItemRequest request) {
+    MediaItemRequest itemCreation = request.getItem();
+    MediaItem item = MediaItemRequest.asMediaItem(itemCreation);
+    library.addMediaItem(item, librarian);
+
+    CreateMediaItemResponse response =
+        CreateMediaItemResponse.builder().item(getItemById(item.getId()).getBody()).build();
+    return response;
+  }
+
+  @DeleteMapping("/items/{id}")
+  public ResponseEntity<Void> deleteItem(@PathVariable UUID id) {
+    SearchCriteria criteria = SearchCriteria.builder().id(id.toString()).build();
+    Set<MediaItem> items = library.search(criteria);
+
+    if (items.isEmpty()) {
+      return ResponseEntity.notFound().build();
+    } else {
+      MediaItem item = items.iterator().next();
+      library.removeMediaItem(item, librarian);
+
+      return ResponseEntity.noContent().build();
+    }
+  }
 }