diff --git a/.idea/misc.xml b/.idea/misc.xml
index 639900d..6f29fee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Java-Assignment-005.iml b/Java-Assignment-005.iml
index b46c0dd..e1006ff 100644
--- a/Java-Assignment-005.iml
+++ b/Java-Assignment-005.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/Quadratic.java b/src/Quadratic.java
new file mode 100644
index 0000000..1922714
--- /dev/null
+++ b/src/Quadratic.java
@@ -0,0 +1,56 @@
+/*
+Quinn McKay
+2/23/2024
+Java Assignment 05
+ */
+
+import java.util.Scanner;
+public class Quadratic {
+
+    public static void main(String [] args){
+
+        double a;
+        double b;
+        double c;
+
+        System.out.print("Let's calculate the roots of a quadratic equation using the formula ");
+        System.out.println("x = -b +-sqrt{b^2 - 4ac} / 2a");
+        System.out.println();
+
+        Scanner a_value = new Scanner(System.in);
+        System.out.print("First, enter the value of a: ");
+        a = a_value.nextDouble();
+        System.out.println();
+
+        Scanner b_value = new Scanner(System.in);
+        System.out.print("Next, enter the value of b: ");
+        b = b_value.nextDouble();
+        System.out.println();
+
+        Scanner c_value = new Scanner(System.in);
+        System.out.print("Last, enter the value of c: ");
+        c = c_value.nextDouble();
+        System.out.println();
+
+        double x_1;
+        double x_2;
+        double xb2_4ac;
+        double xsqrt;
+        xb2_4ac = Math.pow(b,2) - (4 * a * c);
+        xsqrt = Math.sqrt(xb2_4ac);
+        x_1 = (-b + xsqrt) / (2 * a);
+        x_2 = (-b - xsqrt) / (2 * a);
+
+        if (a == 0){
+            System.out.println("Error- a can not equal 0 in this scenario.");
+        } if (xb2_4ac < 0){
+            System.out.println("Error- cannot find square root of a negative number.");
+        } else if (!(a == 0 && xb2_4ac < 0)){
+            System.out.println("Great know lets find the two x values");
+        }
+        System.out.println();
+
+        System.out.println("The value of the first x is " + x_1);
+        System.out.println("The value of the second x is "+ x_2);
+    }
+}