diff --git a/.idea/misc.xml b/.idea/misc.xml
index cb3f61e..bd7a395 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,7 +10,7 @@
   <component name="VisualizationToolProject">
     <option name="state">
       <ProjectState>
-        <option name="scale" value="0.22" />
+        <option name="scale" value="0.045764362220058426" />
       </ProjectState>
     </option>
   </component>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6a86f08..b1cbda1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,9 @@
             android:exported="false"
             android:label="@string/title_activity_notes"/>
         <activity android:name=".main.MainActivity"/>
+
         <activity android:name=".quiz.QuizActivity"/>
+        <activity android:name=".dice.DiceActivity"/>
         <activity
             android:name=".login.LoginActivity"
             android:exported="true">
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/BtnID.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/BtnID.java
index 61872e8..a3749df 100644
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/BtnID.java
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/BtnID.java
@@ -6,5 +6,7 @@ public enum BtnID {
     DELETE_BUTTON,
     NOTES_BUTTON,
     QUIZ_BUTTON,
+    DICE_BUTTON,
     BACKGROUND_BUTTON
+
 }
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/dice/BtnOnClickListener.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/dice/BtnOnClickListener.java
new file mode 100644
index 0000000..2460891
--- /dev/null
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/dice/BtnOnClickListener.java
@@ -0,0 +1,22 @@
+package xyz.r0r5chach.cpsAssist.dice;
+
+
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.Random;
+
+import xyz.r0r5chach.cpsAssist.R;
+
+public class BtnOnClickListener implements View.OnClickListener{
+    @Override
+    public void onClick(View v) {
+        LinearLayout l = (LinearLayout) v.getParent();
+        Random rand = new Random();
+        TextView output = l.findViewById(R.id.dice_output);
+        EditText input = l.findViewById(R.id.dice_input);
+        output.setText(String.valueOf(rand.nextInt(Integer.parseInt(input.getText().toString()))));
+    }
+}
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/dice/DiceActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/dice/DiceActivity.java
new file mode 100644
index 0000000..768fb40
--- /dev/null
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/dice/DiceActivity.java
@@ -0,0 +1,18 @@
+package xyz.r0r5chach.cpsAssist.dice;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import xyz.r0r5chach.cpsAssist.R;
+import xyz.r0r5chach.cpsAssist.dice.BtnOnClickListener;
+
+public class DiceActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dice);
+        findViewById(R.id.dice_roll_button).setOnClickListener(new BtnOnClickListener());
+    }
+
+}
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/main/BtnOnClickListener.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/BtnOnClickListener.java
index acdb84c..f63844d 100644
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/main/BtnOnClickListener.java
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/BtnOnClickListener.java
@@ -10,6 +10,7 @@ import java.util.Locale;
 import java.util.Random;
 
 import xyz.r0r5chach.cpsAssist.BtnID;
+import xyz.r0r5chach.cpsAssist.dice.DiceActivity;
 import xyz.r0r5chach.cpsAssist.R;
 import xyz.r0r5chach.cpsAssist.quiz.QuizActivity;
 import xyz.r0r5chach.cpsAssist.notes.NotesActivity;
@@ -33,6 +34,8 @@ public class BtnOnClickListener implements View.OnClickListener{
             case QUIZ_BUTTON:
                 intent = new Intent(v.getContext(), QuizActivity.class);
                 break;
+            case DICE_BUTTON:
+                intent = new Intent(v.getContext(), DiceActivity.class);
             case BACKGROUND_BUTTON:
                 Random rand = new Random();
                 backgroundColor = String.format("#%06x", rand.nextInt(0xffffff + 1));
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/main/MainActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/MainActivity.java
index 8e7b414..1b56fea 100644
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/main/MainActivity.java
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/MainActivity.java
@@ -27,5 +27,6 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.notes_button).setOnClickListener(lstn);
         findViewById(R.id.quiz_button).setOnClickListener(lstn);
         findViewById(R.id.background_button).setOnClickListener(lstn);
+        findViewById(R.id.dice_button).setOnClickListener(lstn);
     }
 }
diff --git a/app/src/main/res/layout/activity_dice.xml b/app/src/main/res/layout/activity_dice.xml
new file mode 100644
index 0000000..51c8338
--- /dev/null
+++ b/app/src/main/res/layout/activity_dice.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/dice_output"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="" />
+
+    <EditText
+        android:id="@+id/dice_input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints=""
+        android:ems="10"
+        android:hint="@string/dice_hint"
+        android:inputType="number"
+        android:minHeight="48dp" />
+
+    <Button
+        android:id="@+id/dice_roll_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/dice_button_text" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9afd1dd..51bac59 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,4 +22,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/change_background_button_text" />
+    <Button
+        android:id="@+id/dice_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/dice_roller_button_text"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 668a599..5e6f089 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,5 +17,8 @@
     <string name="saveButtonText">Save</string>
     <string name="quiz_button_text">Quiz</string>
     <string name="submit_button_text">Submit</string>
+    <string name="dice_hint">How many sides do you want the dice to have?</string>
+    <string name="dice_button_text">Roll</string>
+    <string name="dice_roller_button_text">Dice Roller</string>
     <string name="change_background_button_text">Change Background</string>
 </resources>
\ No newline at end of file