diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
index 44f4f4b..8166c9f 100644
--- a/.github/workflows/javadoc.yml
+++ b/.github/workflows/javadoc.yml
@@ -33,4 +33,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./app/build/docs/javadoc
-          force_orphan: 'true'
\ No newline at end of file
+          force_orphan: 'true'
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 081b96f..e8fe4f2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
   "github.copilot.enable": false,
-  "java.configuration.updateBuildConfiguration": "automatic"
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "java.compile.nullAnalysis.mode": "automatic"
 }
\ No newline at end of file
diff --git a/app/src/main/java/dev/project516/JavaAppTemplate/Greet.java b/app/src/main/java/dev/project516/JavaAppTemplate/Greet.java
new file mode 100644
index 0000000..39e9e27
--- /dev/null
+++ b/app/src/main/java/dev/project516/JavaAppTemplate/Greet.java
@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: 2026 project516 <project516@project516.dev>
+//
+// SPDX-License-Identifier: MIT
+
+package dev.project516.JavaAppTemplate;
+
+import java.util.ArrayList;
+import java.util.Random;
+
+public class Greet {
+
+    ArrayList<String> greetingList = new ArrayList<String>();
+
+    Random rand = new Random();
+
+    public Greet() {
+        greetingList.add("Hi");
+        greetingList.add("Hello");
+    }
+
+    public String greetUser() {
+        return greetingList.get(rand.nextInt(2));
+    }
+}
diff --git a/app/src/main/java/dev/project516/JavaAppTemplate/Main.java b/app/src/main/java/dev/project516/JavaAppTemplate/Main.java
index c3f2b1a..36d20ee 100644
--- a/app/src/main/java/dev/project516/JavaAppTemplate/Main.java
+++ b/app/src/main/java/dev/project516/JavaAppTemplate/Main.java
@@ -6,12 +6,8 @@
 
 public class Main {
 
-    public String greetUser() {
-        return "Hello!";
-    }
-
     public static void main(String[] args) {
 
-        System.out.println(new Main().greetUser());
+        System.out.println(new Greet().greetUser());
     }
 }
diff --git a/app/src/test/java/dev/project516/JavaAppTemplate/MainTest.java b/app/src/test/java/dev/project516/JavaAppTemplate/GreetTest.java
similarity index 82%
rename from app/src/test/java/dev/project516/JavaAppTemplate/MainTest.java
rename to app/src/test/java/dev/project516/JavaAppTemplate/GreetTest.java
index 99e7070..59e596d 100644
--- a/app/src/test/java/dev/project516/JavaAppTemplate/MainTest.java
+++ b/app/src/test/java/dev/project516/JavaAppTemplate/GreetTest.java
@@ -8,10 +8,10 @@
 
 import org.junit.Test;
 
-public class MainTest {
+public class GreetTest {
     @Test
     public void testGreetsUser() {
-        Main classUnderTest = new Main();
+        Greet classUnderTest = new Greet();
         assertNotNull("Should greet the user", classUnderTest.greetUser());
     }
 }