diff --git a/lesson_02/quiz/src/lesson2.ts b/lesson_02/quiz/src/lesson2.ts
index aa22c2e..922bb96 100644
--- a/lesson_02/quiz/src/lesson2.ts
+++ b/lesson_02/quiz/src/lesson2.ts
@@ -39,7 +39,7 @@ export class Lesson2 {
         [AnswerChoice.C, "To delete unnecessary files"],
         [AnswerChoice.D, "To run code more efficiently"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.B, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -56,7 +56,7 @@ export class Lesson2 {
         [AnswerChoice.C, "A tool for merging branches"],
         [AnswerChoice.D, "A way to delete a repository"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.A, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -70,7 +70,7 @@ export class Lesson2 {
         [AnswerChoice.C, "Push changes to the server"],
         [AnswerChoice.D, "Write code directly in GitHub"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.D, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -84,7 +84,7 @@ export class Lesson2 {
         [AnswerChoice.C, "git branch"],
         [AnswerChoice.D, "git pull"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.B, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -98,7 +98,7 @@ export class Lesson2 {
         [AnswerChoice.C, "NetBeans"],
         [AnswerChoice.D, "VS Code"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.D, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -112,7 +112,7 @@ export class Lesson2 {
         [AnswerChoice.C, "Dev Containers"],
         [AnswerChoice.D, "Source Control"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.C, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -126,7 +126,7 @@ export class Lesson2 {
         [AnswerChoice.C, "Playing music"],
         [AnswerChoice.D, "Managing source control"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.C, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -140,7 +140,7 @@ export class Lesson2 {
         [AnswerChoice.C, "cd"],
         [AnswerChoice.D, "mkdir"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.B, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -154,7 +154,7 @@ export class Lesson2 {
         [AnswerChoice.C, "cd"],
         [AnswerChoice.D, "mkdir"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.C, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -168,7 +168,7 @@ export class Lesson2 {
         [AnswerChoice.C, "Remove a file or directory"],
         [AnswerChoice.D, "Copy a file or directory"],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.A, // Replace `UNANSWERED` with the correct answer.
     );
   }
 
@@ -182,7 +182,7 @@ export class Lesson2 {
         [AnswerChoice.C, "⌘ + Q"],
         [AnswerChoice.D, '⌘ + S, then type "terminal"'],
       ]),
-      AnswerChoice.UNANSWERED, // Replace `UNANSWERED` with the correct answer.
+      AnswerChoice.B, // Replace `UNANSWERED` with the correct answer.
     );
   }
 }
diff --git a/lesson_02/quiz_java/.gitattributes b/lesson_02/quiz_java/.gitattributes
new file mode 100644
index 0000000..f91f646
--- /dev/null
+++ b/lesson_02/quiz_java/.gitattributes
@@ -0,0 +1,12 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
+# Binary files should be left untouched
+*.jar           binary
+
diff --git a/lesson_02/quiz_java/.gitignore b/lesson_02/quiz_java/.gitignore
new file mode 100644
index 0000000..1b6985c
--- /dev/null
+++ b/lesson_02/quiz_java/.gitignore
@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/lesson_02/quiz_java/app/build.gradle.kts b/lesson_02/quiz_java/app/build.gradle.kts
new file mode 100644
index 0000000..0c3180b
--- /dev/null
+++ b/lesson_02/quiz_java/app/build.gradle.kts
@@ -0,0 +1,55 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Java application project to get you started.
+ * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/9.0.0/userguide/building_java_projects.html in the Gradle documentation.
+ */
+
+plugins {
+    java
+   id("org.springframework.boot") version "3.1.0"
+   id("io.spring.dependency-management") version "1.1.0"
+   application
+}
+repositories {
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+    flatDir {
+        dirs("../../../code-society-25-2/lib/java/codedifferently-instructional/instructional-lib")
+    }
+}
+
+
+    // Instead of this (which doesn't work):
+    // implementation("com.codedifferently.instructional:instructional-lib")
+    
+    // Use direct file reference:
+    dependencies {
+    implementation("org.apache.commons:commons-text:1.10.0")
+    implementation(project(":instructional-lib"))
+    implementation("org.springframework.boot:spring-boot-starter")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+
+
+}
+
+// Apply a specific Java toolchain to ease working on different environments.
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+application {
+    // Define the main class for the application.
+    mainClass.set("org.example.Lesson2")
+}
+
+tasks.named<Test>("test") {
+    // Use JUnit Platform for unit tests.
+    useJUnitPlatform()
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+}
\ No newline at end of file
diff --git a/lesson_02/quiz_java/app/src/main/java/org/example/Lesson2.java b/lesson_02/quiz_java/app/src/main/java/org/example/Lesson2.java
new file mode 100644
index 0000000..1a875c2
--- /dev/null
+++ b/lesson_02/quiz_java/app/src/main/java/org/example/Lesson2.java
@@ -0,0 +1,324 @@
+/**
+ * Lesson2 Quiz Generator
+ * 
+ * This class provides a comprehensive quiz covering fundamental programming concepts
+ * including version control (Git), Integrated Development Environments (IDEs),
+ * and command line interface (CLI) operations. The quiz consists of 11 multiple-choice
+ * questions designed to test understanding of basic development tools and workflows.
+ * 
+ * Topics covered:
+ * - Git version control system and workflows
+ * - IDE features and usage (specifically VS Code)
+ * - Command line operations and file permissions
+ * - Development environment setup
+ * 
+ */
+
+package org.example;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.codedifferently.instructional.quiz.AnswerChoice;
+import com.codedifferently.instructional.quiz.MultipleChoiceQuizQuestion;
+import com.codedifferently.instructional.quiz.QuizQuestion;
+
+public class Lesson2 {
+   
+ /**
+     * Creates Question 0: Version Control Purpose
+     * 
+     * Tests understanding of the main purpose of version control systems.
+     * 
+     * @return A MultipleChoiceQuizQuestion about version control fundamentals
+     */
+    private static QuizQuestion makeQuestion0() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "To make backups of files");
+        answerOptions.put(AnswerChoice.B, "To keep a record of changes over time");
+        answerOptions.put(AnswerChoice.C, "To delete unnecessary files");
+        answerOptions.put(AnswerChoice.D, "To run code more efficiently");
+        
+        return new MultipleChoiceQuizQuestion(
+            0,
+            "What is the main purpose of version control?",
+            answerOptions,
+            AnswerChoice.B // The correct answer
+        );
+    }
+
+    /**
+     * Creates Question 1: Git Fork Concept
+     * 
+     * Tests understanding of what a fork means in Git version control.
+     * 
+     * @return A MultipleChoiceQuizQuestion about Git forking
+     */
+    private static QuizQuestion makeQuestion1() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "A duplicate copy of a repository that you own and modify");
+        answerOptions.put(AnswerChoice.B, "A temporary backup of the code");
+        answerOptions.put(AnswerChoice.C, "A tool for merging branches");
+        answerOptions.put(AnswerChoice.D, "A way to delete a repository");
+        
+        return new MultipleChoiceQuizQuestion(
+            1,
+            "What is a fork in Git?",
+            answerOptions,
+            AnswerChoice.A // The correct answer
+        );
+    }
+
+    /**
+     * Creates Question 2: Git Workflow Components
+     * 
+     * Tests knowledge of what is NOT part of the basic Git workflow.
+     * 
+     * @return A MultipleChoiceQuizQuestion about Git workflow steps
+     */
+    private static QuizQuestion makeQuestion2() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "Pull the latest changes");
+        answerOptions.put(AnswerChoice.B, "Commit changes locally");
+        answerOptions.put(AnswerChoice.C, "Push changes to the server");
+        answerOptions.put(AnswerChoice.D, "Write code directly in GitHub");
+        
+        return new MultipleChoiceQuizQuestion(
+            2,
+            "Which of the following is NOT part of the basic Git workflow?",
+            answerOptions,
+            AnswerChoice.D // The correct answer
+        );
+    }
+
+    /**
+     * Creates Question 3: Git Branch Merging
+     * 
+     * Tests knowledge of Git commands for combining changes from different branches.
+     * 
+     * @return A MultipleChoiceQuizQuestion about Git merge commands
+     */
+    private static QuizQuestion makeQuestion3() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "git commit");
+        answerOptions.put(AnswerChoice.B, "git merge");
+        answerOptions.put(AnswerChoice.C, "git branch");
+        answerOptions.put(AnswerChoice.D, "git pull");
+        
+        return new MultipleChoiceQuizQuestion(
+            3,
+            "What command is used to combine changes from different branches?",
+            answerOptions,
+            AnswerChoice.B // The correct answer
+        );
+    }
+
+    /**
+     * Creates Question 4: IDE Selection
+     * 
+     * Tests knowledge of which IDE is being used in the class.
+     * 
+     * @return A MultipleChoiceQuizQuestion about the class IDE
+     */
+    private static QuizQuestion makeQuestion4() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "Eclipse");
+        answerOptions.put(AnswerChoice.B, "IntelliJ IDEA");
+        answerOptions.put(AnswerChoice.C, "NetBeans");
+        answerOptions.put(AnswerChoice.D, "VS Code");
+        
+        return new MultipleChoiceQuizQuestion(
+            4,
+            "Which IDE is being used in the class?",
+            answerOptions,
+            AnswerChoice.D // The correct answer
+        );
+    }
+
+    /**
+     * Creates Question 5: VS Code Dev Containers
+     * 
+     * Tests understanding of VS Code features for consistent development environments.
+     * 
+     * @return A MultipleChoiceQuizQuestion about VS Code Dev Containers
+     */
+    private static QuizQuestion makeQuestion5() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "Extensions");
+        answerOptions.put(AnswerChoice.B, "Debugger");
+        answerOptions.put(AnswerChoice.C, "Dev Containers");
+        answerOptions.put(AnswerChoice.D, "Source Control");
+        
+        return new MultipleChoiceQuizQuestion(
+            5,
+            "What feature allows developers to work from the same pre-configured environment in VS Code?",
+            answerOptions,
+            AnswerChoice.C // The correct answer
+        );
+    }
+
+    /**
+     * Creates Question 6: IDE Usage Purposes
+     * 
+     * Tests understanding of what is NOT a typical reason for using an IDE.
+     * 
+     * @return A MultipleChoiceQuizQuestion about IDE purposes
+     */
+    private static QuizQuestion makeQuestion6() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "Editing and refactoring code");
+        answerOptions.put(AnswerChoice.B, "Browsing code");
+        answerOptions.put(AnswerChoice.C, "Playing music");
+        answerOptions.put(AnswerChoice.D, "Managing source control");
+        
+        return new MultipleChoiceQuizQuestion(
+            6,
+            "What is NOT a reason for using an IDE?",
+            answerOptions,
+            AnswerChoice.C // The correct answer
+        );
+    }
+
+    /**
+     * Creates Question 7: Listing Files in CLI
+     * 
+     * Tests knowledge of the command to list files in the current directory.
+     * 
+     * @return A MultipleChoiceQuizQuestion about CLI file listing commands
+     */
+    private static QuizQuestion makeQuestion7() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "pwd");
+        answerOptions.put(AnswerChoice.B, "ls");
+        answerOptions.put(AnswerChoice.C, "cd");
+        answerOptions.put(AnswerChoice.D, "mkdir");
+        
+        return new MultipleChoiceQuizQuestion(
+            7,
+            "What is the command to list files in the current directory?",
+            answerOptions,
+            AnswerChoice.B // The correct answer
+        );
+    }
+    /**
+     * Creates Question 8: Changing Directories in CLI
+     * 
+     * Tests knowledge of the command to change directories in the terminal.
+     * 
+     * @return A MultipleChoiceQuizQuestion about CLI directory commands
+     */
+    private static QuizQuestion makeQuestion8() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "pwd");
+        answerOptions.put(AnswerChoice.B, "ls");
+        answerOptions.put(AnswerChoice.C, "cd");
+        answerOptions.put(AnswerChoice.D, "mkdir");
+        
+        return new MultipleChoiceQuizQuestion(
+            8,
+            "Which command is used to change directories in the terminal?",
+            answerOptions,
+            AnswerChoice.C // The correct answer
+        );
+    }
+    /**
+     * Creates Question 9: File Permissions Command
+     * 
+     * Tests knowledge of the command used to change file or directory permissions.
+     * 
+     * @return A MultipleChoiceQuizQuestion about file permissions commands
+     */
+    private static QuizQuestion makeQuestion9() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "Change file or directory permissions");
+        answerOptions.put(AnswerChoice.B, "List files in a directory");
+        answerOptions.put(AnswerChoice.C, "Remove a file or directory");
+        answerOptions.put(AnswerChoice.D, "Copy a file or directory");
+        
+        return new MultipleChoiceQuizQuestion(
+            9,
+            "What does the command `chmod` do?",
+            answerOptions,
+            AnswerChoice.A // The correct answer
+        );
+    }
+    /**
+     * Creates Question 10: Mac Terminal Shortcut
+     * 
+     * Tests knowledge of the keyboard shortcut to open the Mac terminal.
+     * 
+     * @return A MultipleChoiceQuizQuestion about Mac terminal shortcuts
+     */
+    private static QuizQuestion makeQuestion10() {
+        Map<AnswerChoice, String> answerOptions = new HashMap<>();
+        answerOptions.put(AnswerChoice.A, "⌘ + Shift + T");
+        answerOptions.put(AnswerChoice.B, "⌘ + Spacebar, then type \"terminal\"");
+        answerOptions.put(AnswerChoice.C, "⌘ + Q");
+        answerOptions.put(AnswerChoice.D, "⌘ + S, then type \"terminal\"");
+        
+        return new MultipleChoiceQuizQuestion(
+            10,
+            "What is the shortcut for getting to the Mac terminal?",
+            answerOptions,
+            AnswerChoice.B // The correct answer
+        );
+    }
+    /**
+     * Generates an array of all quiz questions.
+     * 
+     * @return An array of QuizQuestion objects representing the quiz
+     */
+    public static QuizQuestion[] makeQuizQuestions() {
+        return new QuizQuestion[] {
+            makeQuestion0(),
+            makeQuestion1(),
+            makeQuestion2(),
+            makeQuestion3(),
+            makeQuestion4(),
+            makeQuestion5(),
+            makeQuestion6(),
+            makeQuestion7(),
+            makeQuestion8(),
+            makeQuestion9(),
+            makeQuestion10()
+        };
+    }
+
+    /**
+     * Displays a quiz question and its answer options.
+     * 
+     * @param question The QuizQuestion to display
+     */
+    private static void displayQuestion(QuizQuestion question) {
+        System.out.println("Question " + question.getQuestionNumber() + ": " + question.getQuestionPrompt());
+        
+        if (question instanceof MultipleChoiceQuizQuestion) {
+            MultipleChoiceQuizQuestion mcq = (MultipleChoiceQuizQuestion) question;
+            System.out.println("A. " + mcq.getAnswerForOption(AnswerChoice.A));
+            System.out.println("B. " + mcq.getAnswerForOption(AnswerChoice.B));
+            System.out.println("C. " + mcq.getAnswerForOption(AnswerChoice.C));
+            System.out.println("D. " + mcq.getAnswerForOption(AnswerChoice.D));
+            System.out.println("Correct answer: " + question.getAnswer());
+        }
+        System.out.println(); // Empty line for spacing
+    }
+    /**
+     * Main method to run the quiz and display all questions.
+     * 
+     * @param args Command line arguments (not used)
+     */
+    public static void main(String[] args) {
+        System.out.println("=== Lesson 2 Quiz ===");
+        System.out.println();
+        
+        // Get all quiz questions
+        QuizQuestion[] questions = makeQuizQuestions();
+        
+        // Display all questions
+        for (QuizQuestion question : questions) {
+            displayQuestion(question);
+        }
+        
+        System.out.println("Quiz completed! Total questions: " + questions.length);
+    }
+}
diff --git a/lesson_02/quiz_java/app/src/main/resources/application.yml b/lesson_02/quiz_java/app/src/main/resources/application.yml
new file mode 100644
index 0000000..bdd13af
--- /dev/null
+++ b/lesson_02/quiz_java/app/src/main/resources/application.yml
@@ -0,0 +1,14 @@
+quiz:
+  answers:
+    default:
+      - "$2b$10$NAd9CW5qzDshcM7bDieFoeeXaDMqdVLMtnppx.0h262XIp40h0n5O" # Question 0: B
+      - "$2b$10$ajTOc076fB56QKkqHT4DqOC.LGnsxSvE0JbkltGpGDqji.kM14sw." # Question 1: A
+      - "$2b$10$B3swnHPu0FjtivVpVzbmfu5WhYyK8/.x13FzcK32Yt6VqwOwWli1i" # Question 2: D
+      - "$2b$10$K17AHZ0ZqOtG3lmQLYEEIOSVt4/M50DtP/MLQrj.6z566KPaJPd5a" # Question 3: B
+      - "$2b$10$CQcdUBe42iZfWybJUPizQubZ7Npy01Rx1lqj.qKMRoQyN9sooy.XW" # Question 4: D
+      - "$2b$10$d/jVXKcFzhpXrcwGeSSPlOxMAmqOOF6S5jaUqe3aS6uTXsr7HNj2y" # Question 5: C
+      - "$2b$10$cJxO5tlXsowuNAilAOZ7s.AuKxZzXOMvWn/hkZK9EK6iNjN/ICWDe" # Question 6: C
+      - "$2b$10$kcoELn4lh68bUCEzOVNryOlJEglJKJcI48sq4URqpeHmRp1vWLPxK" # Question 7: B
+      - "$2b$10$onmjZ6Jrs.NdMHa9MbohwO1vWNRX1B6DdqcjNlF/SE3Ge6ywjQhsC" # Question 8: C
+      - "$2b$10$VPW0pQUCLNY.3QSEm9T9SOXpebgfW5BzUWBdlBJukDK4NSt4IJru2" # Question 9: A
+      - "$2b$10$896iaDmmbMQSHz0bqW7uy.Q/rAQu1bzf/6/ix46u4zfELGf32HJLO" # Question 10: B
diff --git a/lesson_02/quiz_java/app/src/test/java/org/example/Lesson2Test.java b/lesson_02/quiz_java/app/src/test/java/org/example/Lesson2Test.java
new file mode 100644
index 0000000..8d39455
--- /dev/null
+++ b/lesson_02/quiz_java/app/src/test/java/org/example/Lesson2Test.java
@@ -0,0 +1,144 @@
+package org.example;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+
+import com.codedifferently.instructional.quiz.AnswerChoice;
+import com.codedifferently.instructional.quiz.QuizConfig;
+import com.codedifferently.instructional.quiz.QuizQuestion;
+
+/**
+ * Lesson2Test - Unit Test Suite for Lesson 2 Quiz
+ * 
+ * This test class validates the functionality and integrity of the Lesson 2 quiz
+ * system, which covers fundamental programming concepts including version control
+ * (Git), Integrated Development Environments (IDEs), and command line interface
+ * (CLI) operations.
+ * 
+ * The test suite verifies:
+ * - Correct number of questions (11 total)
+ * - Proper question numbering sequence (0-10)
+ * - Unique question prompts to avoid duplication
+ * - Answer validation against bcrypt-encrypted expected answers
+ * - Integration with QuizConfig for answer verification
+ * 
+ * This class uses Spring Boot's testing framework with dependency injection
+ * for QuizConfig and JUnit 5 for test execution and assertions.
+ * 
+ * */
+
+@SpringBootTest
+class Lesson2Test {
+    private static final int EXPECTED_NUMBER_OF_QUESTIONS = 11;
+    private QuizQuestion[] quizQuestions;
+    @Autowired
+    private QuizConfig quizConfig;
+    /**
+     * Test setup method executed before each test.
+     * 
+     * Initializes the quiz questions array by calling Lesson2.makeQuizQuestions()
+     * and sets up a new QuizConfig instance for answer validation. This method
+     * ensures each test starts with a fresh set of questions and configuration.
+     * 
+     * The QuizConfig is manually instantiated here rather than relying solely
+     * on Spring injection to ensure test isolation and consistency.
+     */
+    @BeforeEach
+    void setUp() {
+        quizQuestions = Lesson2.makeQuizQuestions();
+        quizConfig = new QuizConfig();
+
+        // Manual setup of QuizConfig with bcrypt hashes
+        
+    }
+
+    /**
+     * Validates that quiz questions are assembled correctly.
+     * 
+     * This test verifies two critical aspects of quiz assembly:
+     * 1. The total number of questions matches the expected count (11)
+     * 2. Questions are numbered sequentially from 0 to 10
+     * 
+     * Proper numbering is essential for answer validation and quiz presentation.
+     * 
+     * @throws AssertionError if the number of questions is incorrect or 
+     *                       if any question has an incorrect number
+     */
+
+    @Bean
+    void checkQuizQuestions_areAssembledCorrectly() {
+        // Expect the right number of questions.
+        assertEquals(EXPECTED_NUMBER_OF_QUESTIONS, quizQuestions.length);
+
+        // Expect questions to be numbered correctly.
+        for (int i = 0; i < quizQuestions.length; i++) {
+            assertEquals(i, quizQuestions[i].getQuestionNumber());
+        }
+    }
+
+    /**
+     * Ensures all question prompts are unique.
+     * 
+     * This test validates that no two questions have identical prompts, which
+     * could confuse quiz takers or indicate duplicate content. It uses a HashSet
+     * to detect duplicates by comparing the size of the set (unique prompts)
+     * with the total number of questions.
+     * 
+     * Unique prompts are essential for a well-designed quiz to ensure each
+     * question tests distinct knowledge or skills.
+     * 
+     * @throws AssertionError if duplicate question prompts are found
+     */
+    @Bean
+    void shouldHaveUniqueQuestionPrompts() {
+        // Test equivalent to TypeScript: "should have unique question prompts"
+        Set<String> questionPrompts = new HashSet<>();
+        for (QuizQuestion question : quizQuestions) {
+            questionPrompts.add(question.getQuestionPrompt());
+        }
+        assertEquals(EXPECTED_NUMBER_OF_QUESTIONS, questionPrompts.size(),
+            "All questions should have unique prompts");
+    }
+
+    /**
+     * Validates that all questions are answered correctly.
+     * 
+     * This comprehensive test performs multiple validations:
+     * 1. Verifies the QuizConfig contains the expected number of answers
+     * 2. Ensures no questions are marked as UNANSWERED
+     * 3. Validates each answer against the bcrypt-encrypted expected answers
+     * 
+     * The test uses QuizConfig.checkAnswer() to verify answers, which supports
+     * bcrypt encryption for secure answer validation. This prevents hardcoded
+     * answers from being easily discovered in the source code.
+     * 
+     * @throws AssertionError if any question is unanswered or incorrectly answered
+     * @throws IllegalStateException if QuizConfig is not properly initialized
+     */
+    @Bean
+    void checkQuestions_answeredCorrectly() {
+        assertEquals(EXPECTED_NUMBER_OF_QUESTIONS, quizConfig.size("default"));
+
+        for (QuizQuestion question : quizQuestions) {
+            String actualAnswer = question.getAnswer();
+
+            // Check that the question was answered (Java equivalent of softExpect)
+            assertNotEquals(AnswerChoice.UNANSWERED.toString(), actualAnswer,
+                "Question " + question.getQuestionNumber() + " should be answered");
+
+            // Check that the answer is correct (Java doesn't need async/await)
+            assertTrue(quizConfig.checkAnswer("default", question.getQuestionNumber(), actualAnswer),
+                "Question " + question.getQuestionNumber() + " answer should be correct");
+        }
+    }
+}
+
+
diff --git a/lesson_02/quiz_java/app/src/test/resources/application.yml b/lesson_02/quiz_java/app/src/test/resources/application.yml
new file mode 100644
index 0000000..58a2f8d
--- /dev/null
+++ b/lesson_02/quiz_java/app/src/test/resources/application.yml
@@ -0,0 +1,14 @@
+quiz:
+  answers:
+    default:
+      - $2y$10$Mijvs3PeAc.DsZBhT4T0jepZqixAOb61iPotSSlIVJGFqpGeBU5dS #0
+      - $2y$10$fMlkDDq4L9g2Q0lzdTMG1u7aw6rjJhKh.B0e/AYfQHUsXhCM6UGIS #1
+      - $2y$10$wJZxd8Ha4EEbb16UoUcqgO7oOU.h8sUOsv8FGu6gLiuKwtI4RKFT2 #2
+      - $2y$10$xAUz.hXIqTamXZg28Hgepe28PS431mmq0WlM48Rji7EkSKD5NfzFy #3
+      - $2y$10$hbV87MTi/JH51hdNfBP9juELK6LSAxPagrFqcnXAD3gLIEOCCqENW #4
+      - $2y$10$kiOyjtBQ7B2BszTJajO9keCBlOPh4pLM.mzugzWB2vtGkOWCSJ366 #5
+      - $2y$10$hCrDJhXV7Gwk0PsBm086p.obO0dk.ZseCfvrx.Vu7U/jqODPaxmFy #6
+      - $2y$10$LvnU8fBR2ABdf2/gatkW1e1n5XcFQWSE6QfcUjIMo2g8Gu6p1NPJu #7
+      - $2y$10$DQUbiJqDiMpypZ1FEwK1QejNDwk05F6suGWj6PdEowOvvsoLYGzZy #8
+      - $2y$10$hzT0JgkSPhMzeuqK4VnD1eoNYkCZ.bg.QL3.VF0vJrmyceWq3bHgC #9
+      - $2y$10$qyOdRBWT8MO.naUyhZRMr.VIy1NkxDY.1WvbnlTu2bcXkgTnpCBH2 #10
diff --git a/lesson_02/quiz_java/gradle.properties b/lesson_02/quiz_java/gradle.properties
new file mode 100644
index 0000000..377538c
--- /dev/null
+++ b/lesson_02/quiz_java/gradle.properties
@@ -0,0 +1,5 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+
+org.gradle.configuration-cache=true
+
diff --git a/lesson_02/quiz_java/gradle/libs.versions.toml b/lesson_02/quiz_java/gradle/libs.versions.toml
new file mode 100644
index 0000000..8da4f83
--- /dev/null
+++ b/lesson_02/quiz_java/gradle/libs.versions.toml
@@ -0,0 +1,10 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
+
+[versions]
+guava = "33.4.6-jre"
+junit-jupiter = "5.12.1"
+
+[libraries]
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
diff --git a/lesson_02/quiz_java/gradle/wrapper/gradle-wrapper.jar b/lesson_02/quiz_java/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e644113
Binary files /dev/null and b/lesson_02/quiz_java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/lesson_02/quiz_java/gradle/wrapper/gradle-wrapper.properties b/lesson_02/quiz_java/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..b82aa23
--- /dev/null
+++ b/lesson_02/quiz_java/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/lesson_02/quiz_java/gradlew b/lesson_02/quiz_java/gradlew
new file mode 100755
index 0000000..1aa94a4
--- /dev/null
+++ b/lesson_02/quiz_java/gradlew
@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/lesson_02/quiz_java/gradlew.bat b/lesson_02/quiz_java/gradlew.bat
new file mode 100644
index 0000000..25da30d
--- /dev/null
+++ b/lesson_02/quiz_java/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/lesson_02/quiz_java/settings.gradle.kts b/lesson_02/quiz_java/settings.gradle.kts
new file mode 100644
index 0000000..665e689
--- /dev/null
+++ b/lesson_02/quiz_java/settings.gradle.kts
@@ -0,0 +1,15 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/9.0.0/userguide/multi_project_builds.html in the Gradle documentation.
+ */
+
+plugins {
+    // Apply the foojay-resolver plugin to allow automatic download of JDKs
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
+rootProject.name = "quiz_java"
+include("app", "instructional-lib")
+project(":instructional-lib").projectDir = file("../../../code-society-25-2/lib/java/codedifferently-instructional/instructional-lib")