diff --git a/src/main/java/Student.java b/src/main/java/Student.java
new file mode 100644
index 00000000..0c91ec28
--- /dev/null
+++ b/src/main/java/Student.java
@@ -0,0 +1,44 @@
+import java.util.ArrayList;
+
+public class Student {
+
+    private long id;
+    private String name;
+    private ArrayList<Integer> grades;
+
+    public Student(String name, long id){
+        this.name = name;
+        this.id = id;
+        this.grades = new ArrayList<Integer>();
+    }
+
+    // returns the student's id
+    public long getId(){
+        return this.id;
+    }
+
+    // returns the student's name
+    public String getName(){
+        return this.name;
+    }
+
+    // adds the given grade to the grades list
+    public void addGrade(int grade){
+        this.grades.add(grade);
+    }
+
+    // returns the list of grades
+    public ArrayList<Integer> getGrades(){
+        return this.grades;
+    }
+
+    // returns the average of the students grades
+    public double getGradeAverage(){
+        int length = this.grades.size();
+        long sum = 0;
+        for (long grade : this.grades){
+            sum += grade;
+        }
+        return (sum/length);
+    }
+}
diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java
new file mode 100644
index 00000000..385db36c
--- /dev/null
+++ b/src/test/java/StudentTest.java
@@ -0,0 +1,24 @@
+import org.hamcrest.core.Is;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+public class StudentTest {
+
+
+    ArrayList<Integer> testArrayList = new ArrayList<>();
+
+    @Test
+    public void studentClassMethodTest(){
+        Student Isaiah = new Student("Isaiah", 1);
+        Assert.assertTrue(Isaiah.getName() == "Isaiah");
+        Assert.assertTrue(Isaiah.getId() == 1);
+        Assert.assertEquals(testArrayList.size(), Isaiah.getGrades().size());
+        Isaiah.addGrade(90);
+        Isaiah.addGrade(95);
+        Isaiah.addGrade(100);
+        Assert.assertTrue(Isaiah.getGradeAverage() == 95);
+    }
+}