diff --git a/lesson_26/api/java/api_app/build.gradle.kts b/lesson_26/api/java/api_app/build.gradle.kts
index ac0c0e680..349bae625 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 {
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..f1319124e 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
@@ -3,13 +3,21 @@
 import com.codedifferently.lesson26.library.Librarian;
 import com.codedifferently.lesson26.library.Library;
 import com.codedifferently.lesson26.library.MediaItem;
+import com.codedifferently.lesson26.library.exceptions.MediaItemCheckedOutException;
 import com.codedifferently.lesson26.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,49 @@ public ResponseEntity<GetMediaItemsResponse> getItems() {
     var response = GetMediaItemsResponse.builder().items(responseItems).build();
     return ResponseEntity.ok(response);
   }
+
+  @PostMapping("/items")
+  public ResponseEntity<CreateMediaItemResponse> createItem(
+      @Valid @RequestBody CreateMediaItemRequest createRequest) {
+    MediaItemRequest itemRequest = createRequest.getItem();
+    MediaItem newItem = MediaItemRequest.asMediaItem(itemRequest);
+    library.addMediaItem(newItem, this.librarian);
+    MediaItemResponse itemResponse = MediaItemResponse.from(newItem);
+    CreateMediaItemResponse response = CreateMediaItemResponse.builder().item(itemResponse).build();
+    return ResponseEntity.ok(response);
+  }
+
+  @GetMapping("/items/{id}")
+  public ResponseEntity<MediaItemResponse> getItemById(@PathVariable UUID id) {
+    Set<MediaItem> items = library.search(SearchCriteria.builder().build());
+    MediaItem foundItem =
+        items.stream().filter(item -> item.getId().equals(id)).findFirst().orElse(null);
+    if (foundItem != null) {
+      MediaItemResponse itemResponse = MediaItemResponse.from(foundItem);
+      return ResponseEntity.ok(itemResponse);
+    } else {
+      return ResponseEntity.notFound().build();
+    }
+  }
+
+  @DeleteMapping("/items/{id}")
+  public ResponseEntity<Void> deleteItem(@PathVariable UUID id) {
+
+    Set<MediaItem> items = library.search(SearchCriteria.builder().build());
+    MediaItem foundItem =
+        items.stream().filter(item -> item.getId().equals(id)).findFirst().orElse(null);
+
+    if (foundItem == null) {
+      return ResponseEntity.notFound().build();
+    }
+
+    try {
+      library.removeMediaItem(id, this.librarian);
+      return ResponseEntity.noContent().build();
+    } catch (MediaItemCheckedOutException ex) {
+      return ResponseEntity.status(HttpStatus.CONFLICT).build();
+    } catch (Exception e) {
+      return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+    }
+  }
 }