diff --git a/grader/pom.xml b/grader/pom.xml
index a95288f92..e398256a8 100644
--- a/grader/pom.xml
+++ b/grader/pom.xml
@@ -175,7 +175,7 @@
             <configuration>
                 <jnlp>
                     <outputFile>grader.jnlp</outputFile>
-                    <mainClass>edu.pdx.cs410J.grader.GradeBookGUI</mainClass>
+                    <mainClass>edu.pdx.cs410J.grader.gradebook.GradeBookGUI</mainClass>
                 </jnlp>
                 <!--
                  defining this will automatically sign the jar and its dependencies
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java b/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java
index abbc94aa9..9d5bdfa18 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java
@@ -357,7 +357,7 @@ public Optional<Student> getStudentWithSsn(String ssn) {
     return this.studentsStream().filter(s -> ssn.equals(s.getSsn())).findAny();
   }
 
-  static class LetterGradeRanges implements Iterable<LetterGradeRanges.LetterGradeRange> {
+  public static class LetterGradeRanges implements Iterable<LetterGradeRanges.LetterGradeRange> {
     private final Map<LetterGrade, LetterGradeRange> ranges = new TreeMap<>();
 
     private LetterGradeRanges() {
@@ -435,7 +435,7 @@ public Spliterator<LetterGradeRange> spliterator() {
       return this.ranges.values().spliterator();
     }
 
-    static class LetterGradeRange {
+    public static class LetterGradeRange {
       private final LetterGrade letterGrade;
       private int maximum;
       private int minimum;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
index 9d42672b1..77f6eab98 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
@@ -3,7 +3,10 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import com.google.common.annotations.VisibleForTesting;
+import edu.pdx.cs410J.grader.gradebook.GradeBookGUI;
 import edu.pdx.cs410J.grader.poa.ui.PlanOfAttackGrader;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionXmlConverter;
+import edu.pdx.cs410J.grader.scoring.ui.ProjectSubmissionsScorer;
 import org.slf4j.LoggerFactory;
 
 import java.io.PrintStream;
@@ -72,6 +75,12 @@ private static Class getToolClass(String tool) {
       case "fixGwtZips":
         return GwtZipFixer.class;
 
+      case "scoreProjectSubmissions":
+        return ProjectSubmissionsScorer.class;
+
+      case "convertProjectOutFilesToXml":
+        return ProjectSubmissionXmlConverter.class;
+
       default:
         usage("Unknown tool: " + tool);
         return null;
@@ -93,16 +102,18 @@ private static void usage(String message) {
     err.println();
     err.println("usage: GraderTools tool toolArg*");
     err.println("  tool                        The tool to execute");
-    err.println("    gradebook                 The Grade Book GUI");
-    err.println("    fetch                     Fetch student surveys or projects from the Grader's");
-    err.println("                              emails account");
-    err.println("    importFromD2L             Import grades from a D2L CSV");
-    err.println("    importFromProjectReports  Import grades from graded project reports");
-    err.println("    mailFileToStudent         Email text files to students");
-    err.println("    gradePOAs                 Tool for downloading and grading POAs");
-    err.println("    generateGradeSummary      Generate grade summary report for one or more students");
-    err.println("    htmlForSurveyResults      Generate an html file for the responses to a D2L survey");
-    err.println("    fixGwtZips                Fix zip files for the GWT project to work with grading script");
+    err.println("    gradebook                     The Grade Book GUI");
+    err.println("    fetch                         Fetch student surveys or projects from the Grader's");
+    err.println("                                  emails account");
+    err.println("    importFromD2L                 Import grades from a D2L CSV");
+    err.println("    importFromProjectReports      Import grades from graded project reports");
+    err.println("    mailFileToStudent             Email text files to students");
+    err.println("    gradePOAs                     Tool for downloading and grading POAs");
+    err.println("    generateGradeSummary          Generate grade summary report for one or more students");
+    err.println("    htmlForSurveyResults          Generate an html file for the responses to a D2L survey");
+    err.println("    fixGwtZips                    Fix zip files for the GWT project to work with grading script");
+    err.println("    scoreProjectSubmissions       Review project submissions and assign them scores");
+    err.println("    convertProjectOutFilesToXml   Review project submissions and assign them scores");
     err.println("  toolArg                     A command line argument to send to the tool");
     err.println();
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java b/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java
index 6ca0cf914..d428b59a6 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java
@@ -22,7 +22,7 @@
 /**
  * This class parses XML data that describes a <code>Student</code>.
  */
-class XmlStudentParser extends XmlHelper {
+public class XmlStudentParser extends XmlHelper {
 
   /** The Reader from which the XML Data is read */ 
   private Reader reader;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/AssignmentPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/AssignmentPanel.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/AssignmentPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/AssignmentPanel.java
index 31e0f9415..6095aca29 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/AssignmentPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/AssignmentPanel.java
@@ -1,6 +1,10 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.Assignment;
+import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.Notable;
+import edu.pdx.cs410J.grader.XmlGradeBookParser;
 
 import javax.swing.*;
 import java.awt.*;
@@ -326,4 +330,5 @@ public void windowClosing(WindowEvent e) {
     frame.pack();
     frame.setVisible(true);
   }
+
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/ClassPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/ClassPanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/ClassPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/ClassPanel.java
index 9dba87da4..f672b9bf4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/ClassPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/ClassPanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -262,7 +263,7 @@ void displayAssignments(GradeBook book) {
     assignmentNames.addAll(book.getAssignmentNames());
     this.assignmentsList.setListData(assignmentNames);
   }
-  
+
   /**
    * Displays an assignment in the appropriate fields
    */
@@ -290,7 +291,7 @@ public static void main(String[] args) {
     } catch (FileNotFoundException ex) {
       System.err.println("** Could not find file: " + ex.getMessage());
       System.exit(1);
-      
+
     } catch (IOException ex) {
       System.err.println("** IOException during parsing: " + ex.getMessage());
       System.exit(1);
@@ -322,7 +323,7 @@ public void windowClosing(WindowEvent e) {
       });
 
     frame.getContentPane().add(classPanel);
-    
+
     frame.pack();
     frame.setVisible(true);
   }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookGUI.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookGUI.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/GradeBookGUI.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookGUI.java
index 221c1f318..8986ba31b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookGUI.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookGUI.java
@@ -1,11 +1,12 @@
-package edu.pdx.cs410J.grader;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
+
+import javax.swing.*;
+import javax.swing.border.Border;
+import java.awt.*;
+import java.awt.event.*;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -14,24 +15,6 @@
 import java.util.TimerTask;
 import java.util.prefs.Preferences;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JToolBar;
-import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
-import javax.swing.border.Border;
-
-import edu.pdx.cs410J.ParserException;
-
 /**
  * This class is a main GUI for manipulate the grade book for CS410J.
  *
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookPanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/GradeBookPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookPanel.java
index 1855e6e23..b41ffd8fd 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookPanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradePanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/GradePanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradePanel.java
index 2f46dd162..544f06768 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradePanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradePanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import javax.swing.border.Border;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/LetterGradeRangesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/LetterGradeRangesPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
index abaa976bf..e209ac80b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/LetterGradeRangesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
@@ -1,4 +1,8 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.LetterGrade;
+import edu.pdx.cs410J.grader.Student;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/NewAssignmentDialog.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NewAssignmentDialog.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/NewAssignmentDialog.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NewAssignmentDialog.java
index e77c65aac..df04c8465 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/NewAssignmentDialog.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NewAssignmentDialog.java
@@ -1,4 +1,6 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.grader.Assignment;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/NotesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NotesPanel.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/NotesPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NotesPanel.java
index ee2ee74b7..307525dd9 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/NotesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NotesPanel.java
@@ -1,4 +1,6 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.grader.Notable;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/StudentPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentPanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/StudentPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentPanel.java
index ad748ff73..c4da1c09a 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/StudentPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentPanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/StudentsList.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentsList.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/StudentsList.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentsList.java
index 9bd14124f..16388bec7 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/StudentsList.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentsList.java
@@ -1,6 +1,9 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.XmlGradeBookParser;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EventBusThatPublishesUnhandledExceptionEvents.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/EventBusThatPublishesUnhandledExceptionEvents.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/EventBusThatPublishesUnhandledExceptionEvents.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/EventBusThatPublishesUnhandledExceptionEvents.java
index b369e13de..a71c846e6 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EventBusThatPublishesUnhandledExceptionEvents.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/EventBusThatPublishesUnhandledExceptionEvents.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/mvp/PresenterOnEventBus.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/PresenterOnEventBus.java
new file mode 100644
index 000000000..3afaf0b6d
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/PresenterOnEventBus.java
@@ -0,0 +1,16 @@
+package edu.pdx.cs410J.grader.mvp;
+
+import com.google.common.eventbus.EventBus;
+
+public class PresenterOnEventBus {
+  private final EventBus bus;
+
+  public PresenterOnEventBus(EventBus bus) {
+    this.bus = bus;
+    this.bus.register(this);
+  }
+
+  protected void publishEvent(Object event) {
+    this.bus.post(event);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEvent.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEvent.java
similarity index 89%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEvent.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEvent.java
index 3587964d2..bafe8606b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEvent.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEvent.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 public class UnhandledExceptionEvent {
   private final Throwable unhandledException;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenter.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenter.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenter.java
index 9331e08c0..543f8a539 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenter.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionView.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionView.java
similarity index 81%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionView.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionView.java
index 848254aa3..deca4ba18 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionView.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 public interface UnhandledExceptionView {
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/TopLevelJFrame.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/TopLevelJFrame.java
similarity index 75%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/TopLevelJFrame.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/TopLevelJFrame.java
index 4f49f5121..25f01acb4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/TopLevelJFrame.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/TopLevelJFrame.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa.ui;
+package edu.pdx.cs410J.grader.mvp.ui;
 
 import com.google.inject.Singleton;
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java
new file mode 100644
index 000000000..1564173d0
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java
@@ -0,0 +1,37 @@
+package edu.pdx.cs410J.grader.mvp.ui;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import org.slf4j.Logger;
+
+public class UIMain {
+  protected final TopLevelJFrame parent;
+
+  public UIMain(TopLevelJFrame parent) {
+    this.parent = parent;
+  }
+
+  private static void printStackTraceForUncaughtException(Throwable e, Logger logger) {
+    e.fillInStackTrace();
+    e.printStackTrace(System.err);
+    logger.error("Uncaught exception", e);
+  }
+
+  protected static void logAllEventsOnBusAtDebugLevel(EventBus bus, Logger logger) {
+    bus.register(new Object() {
+      @Subscribe
+      public void logEvent(Object event) {
+        logger.debug("Event " + event);
+      }
+    });
+  }
+
+  protected static void logAllUncaughtExceptions(Logger logger) {
+    Thread.currentThread().setUncaughtExceptionHandler((t, e) -> printStackTraceForUncaughtException(e, logger));
+  }
+
+  protected void display() {
+    parent.pack();
+    parent.setVisible(true);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UnhandledExceptionDialog.java
similarity index 91%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UnhandledExceptionDialog.java
index 3614bda99..d67f891d4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UnhandledExceptionDialog.java
@@ -1,8 +1,8 @@
-package edu.pdx.cs410J.grader.poa.ui;
+package edu.pdx.cs410J.grader.mvp.ui;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import edu.pdx.cs410J.grader.poa.UnhandledExceptionView;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionView;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java
index 64d7cfafd..19799b631 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java
@@ -5,28 +5,26 @@
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 @Singleton
-public class EmailCredentialsPresenter {
-  private final EventBus bus;
+public class EmailCredentialsPresenter extends PresenterOnEventBus {
   private final EmailCredentialsView view;
   private String emailAddress;
   private String password;
 
   @Inject
   public EmailCredentialsPresenter(EventBus bus, EmailCredentialsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    this.bus.register(this);
-
     this.view.addEmailAddressValueListener(this::setEmailAddress);
     this.view.addPasswordValueListener(this::setPassword);
     this.view.addSubmitCredentialsListener(this::fireEmailCredentialsEvent);
   }
 
   private void fireEmailCredentialsEvent() {
-    this.bus.post(new EmailCredentials(this.emailAddress, this.password));
+    publishEvent(new EmailCredentials(this.emailAddress, this.password));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java
index e0956e474..cdd314ed2 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java
@@ -6,31 +6,29 @@
 import edu.pdx.cs410J.grader.Assignment;
 import edu.pdx.cs410J.grader.GradeBook;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.io.File;
 
-public class GradeBookPresenter {
+public class GradeBookPresenter extends PresenterOnEventBus {
   private final GradeBookView view;
-  private final EventBus bus;
   private GradeBook gradeBook;
 
   @Inject
   public GradeBookPresenter(EventBus bus, GradeBookView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    bus.register(this);
-
     view.addGradeBookFileListener(this::publishLoadGradeBookEvent);
     view.addSaveGradeBookListener(this::publishSaveGradeBookEvent);
   }
 
   private void publishSaveGradeBookEvent() {
-    this.bus.post(new SaveGradeBook(this.gradeBook));
+    publishEvent(new SaveGradeBook(this.gradeBook));
   }
 
   private void publishLoadGradeBookEvent(File file) {
-    this.bus.post(new LoadGradeBook(file));
+    publishEvent(new LoadGradeBook(file));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java
index 0bd87ff92..c487d85d9 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java
@@ -7,6 +7,7 @@
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.Assignment;
 import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -19,18 +20,15 @@
 import java.util.stream.Collectors;
 
 @Singleton
-public class POAAssignmentsPresenter {
-  private final EventBus bus;
+public class POAAssignmentsPresenter extends PresenterOnEventBus {
   private final POAAssignmentsView view;
   private List<Assignment> poaAssignments = Collections.emptyList();
 
   @Inject
   public POAAssignmentsPresenter(EventBus bus, POAAssignmentsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
     this.view.addAssignmentSelectedHandler(this::fireAssignmentSelectedForAssignment);
-
-    this.bus.register(this);
   }
 
   private void fireAssignmentSelectedForAssignment(int index) {
@@ -40,7 +38,7 @@ private void fireAssignmentSelectedForAssignment(int index) {
   }
 
   private void fireAssignmentSelectedEvent(Assignment assignment) {
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new AssignmentSelectedEvent(assignment));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java
index 1251830c8..aac94b0f4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java
@@ -9,12 +9,12 @@
 import edu.pdx.cs410J.grader.Assignment;
 import edu.pdx.cs410J.grader.Grade;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.Optional;
 
 @Singleton
-public class POAGradePresenter {
-  private final EventBus bus;
+public class POAGradePresenter extends PresenterOnEventBus {
   private final POAGradeView view;
 
   private POASubmission submission;
@@ -26,11 +26,9 @@ public class POAGradePresenter {
 
   @Inject
   public POAGradePresenter(EventBus bus, POAGradeView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    this.bus.register(this);
-
     this.view.addIsLateHandler(POAGradePresenter.this::setIsLate);
     this.view.addScoreValueHandler(this::setScoreValue);
     this.view.addRecordGradeHandler(this::publishScoreToMessageBusAndDisplayNextPOA);
@@ -42,11 +40,11 @@ private void publishScoreToMessageBusAndDisplayNextPOA() {
     }
 
     RecordGradeEvent recordGrade = new RecordGradeEvent(this.score, this.student, this.assignment, this.isLate);
-    this.bus.post(recordGrade);
+    publishEvent(recordGrade);
     this.view.setScoreHasBeenRecorded(true);
 
     SelectNextPOAEvent displayNextPOA = new SelectNextPOAEvent();
-    this.bus.post(displayNextPOA);
+    publishEvent(displayNextPOA);
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java
index 031a8d56a..01f3facec 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java
@@ -4,19 +4,19 @@
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 @Singleton
-public class POASubmissionPresenter {
+public class POASubmissionPresenter extends PresenterOnEventBus {
   private final POASubmissionView view;
 
   @Inject
   public POASubmissionPresenter(EventBus bus, POASubmissionView view) {
+    super(bus);
     this.view = view;
-
-    bus.register(this);
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java
index 5c47ebc16..febe7e6b6 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java
@@ -3,13 +3,13 @@
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class POASubmissionsPresenter {
-  private final EventBus bus;
+public class POASubmissionsPresenter extends PresenterOnEventBus {
   private final POASubmissionsView view;
   private final List<POASubmission> submissions = new ArrayList<>();
 
@@ -17,22 +17,20 @@ public class POASubmissionsPresenter {
 
   @Inject
   public POASubmissionsPresenter(EventBus bus, POASubmissionsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
     this.view.addSubmissionSelectedListener(this::poaSubmissionSelected);
     this.view.addDownloadSubmissionsListener(this::fireDownloadSubmissionsEvent);
-
-    this.bus.register(this);
   }
 
   private void fireDownloadSubmissionsEvent() {
-    this.bus.post(new DownloadPOASubmissionsRequest());
+    publishEvent(new DownloadPOASubmissionsRequest());
   }
 
   private void poaSubmissionSelected(int index) {
     this.selectedSubmissionIndex = index;
-    this.bus.post(new POASubmissionSelected(this.submissions.get(index)));
+    publishEvent(new POASubmissionSelected(this.submissions.get(index)));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java
index 9bdca305c..8afbaacbb 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java
@@ -6,6 +6,7 @@
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.GradeBook;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -13,18 +14,15 @@
 import java.util.stream.Collectors;
 
 @Singleton
-public class StudentsPresenter {
-  private final EventBus bus;
+public class StudentsPresenter extends PresenterOnEventBus {
   private final StudentsView view;
   private List<Student> students = Collections.emptyList();
 
   @Inject
   public StudentsPresenter(EventBus bus, StudentsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    this.bus.register(this);
-
     this.view.addSelectStudentHandler(this::fireSelectedStudentEventForStudentAtIndex);
   }
 
@@ -40,7 +38,7 @@ private void fireSelectedStudentEventForStudentAtIndex(int index) {
   }
 
   private void fireStudentSelectedEvent(Student student) {
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java
index 43aaf46d2..49c369483 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java
@@ -2,6 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.poa.EmailCredentialsView;
 
 import javax.swing.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java
index e152f8487..85ea5e7be 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java
@@ -2,6 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.poa.GradeBookView;
 
 import javax.swing.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
index 45817e437..edd562d74 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
@@ -4,6 +4,10 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionPresenter;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionView;
+import edu.pdx.cs410J.grader.mvp.ui.UnhandledExceptionDialog;
 import edu.pdx.cs410J.grader.poa.*;
 
 public class POAGraderUIModule extends AbstractModule {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
index a7f988766..883ee450c 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
@@ -1,11 +1,12 @@
 package edu.pdx.cs410J.grader.poa.ui;
 
 import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
+import edu.pdx.cs410J.grader.mvp.ui.UIMain;
 import edu.pdx.cs410J.grader.poa.DownloadPOASubmissionsRequest;
 import edu.pdx.cs410J.grader.poa.LoadGradeBook;
 import edu.pdx.cs410J.grader.poa.POASubmission;
@@ -17,13 +18,12 @@
 import java.time.LocalDateTime;
 
 @Singleton
-public class PlanOfAttackGrader {
+public class PlanOfAttackGrader extends UIMain {
   private static final Logger logger = LoggerFactory.getLogger(PlanOfAttackGrader.class);
-  private final TopLevelJFrame parent;
 
   @Inject
   public PlanOfAttackGrader(TopLevelJFrame parent, POASubmissionsPanel submissions, POASubmissionInformationPanel submissionInfo) {
-    this.parent = parent;
+    super(parent);
 
     parent.setTitle("Plan Of Attack Grader");
 
@@ -34,12 +34,12 @@ public PlanOfAttackGrader(TopLevelJFrame parent, POASubmissionsPanel submissions
   }
 
   public static void main(String[] args) {
-    Thread.currentThread().setUncaughtExceptionHandler((t, e) -> printStackTrace(e));
+    logAllUncaughtExceptions(logger);
 
     Injector injector = Guice.createInjector(new POAGraderUIModule());
 
     EventBus bus = injector.getInstance(EventBus.class);
-    registerEventLogger(bus);
+    logAllEventsOnBusAtDebugLevel(bus, logger);
 
     PlanOfAttackGrader ui = injector.getInstance(PlanOfAttackGrader.class);
     ui.display();
@@ -53,26 +53,6 @@ public static void main(String[] args) {
     bus.post(new DownloadPOASubmissionsRequest());
   }
 
-  private static void printStackTrace(Throwable e) {
-    e.fillInStackTrace();
-    e.printStackTrace(System.err);
-  }
-
-  private void display() {
-    parent.pack();
-    parent.setVisible(true);
-  }
-
-  private static void registerEventLogger(EventBus bus) {
-    bus.register(new Object() {
-      @Subscribe
-      public void logEvent(Object event) {
-        logger.debug("Event " + event);
-      }
-    });
-
-  }
-
   private static POASubmission createPOASubmission(String subject) {
     POASubmission.Builder builder = POASubmission.builder();
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/GenerateProjectSubmissionXmlFiles.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/GenerateProjectSubmissionXmlFiles.java
new file mode 100644
index 000000000..3a14317a4
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/GenerateProjectSubmissionXmlFiles.java
@@ -0,0 +1,95 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import javax.xml.bind.JAXBException;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GenerateProjectSubmissionXmlFiles {
+
+  public static void main(String... args) {
+    if (args.length == 0) {
+      usage("Missing directory name");
+      return;
+    }
+
+    String directoryName = args[0];
+    File directory = new File(directoryName);
+    if (directory.exists() && !directory.isDirectory()) {
+      usage("Directory " + directory + " must be a directory");
+      return;
+    }
+
+    directory.mkdirs();
+
+    createProjectSubmissions().forEach(s -> writeXmlToDirectory(s, directory));
+  }
+
+  private static void writeXmlToDirectory(ProjectSubmission submission, File directory) {
+    String xmlFileName = submission.getStudentId() + ".xml";
+    File file = new File(directory, xmlFileName);
+    ProjectSubmissionXmlConverter converter = null;
+    try {
+      converter = new ProjectSubmissionXmlConverter();
+      converter.convertToXml(submission, new FileWriter(file));
+
+    } catch (JAXBException | IOException e) {
+      e.printStackTrace(System.err);
+    }
+  }
+
+  private static List<ProjectSubmission> createProjectSubmissions() {
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    String projectName = "Project";
+    for (int i = 0; i < 50; i++) {
+      String studentId = "student" + i;
+      ProjectSubmission submission = new ProjectSubmission();
+      submission.setProjectName(projectName);
+      submission.setStudentId(studentId);
+      submission.setTotalPoints(8.0);
+
+      for (int j = 0; j < 10; j++) {
+        String testCaseName = studentId + "'s test " + j;
+        TestCaseOutput testCaseOutput =
+          new TestCaseOutput()
+            .setName(testCaseName)
+            .setDescription("Test " + j + ": Test " + studentId + "'s " + projectName + " submission")
+            .setCommand("java -jar " + studentId + "/project.jar Test" + j)
+            .setOutput(generateOutput(studentId, j));
+        submission.addTestCaseOutput(testCaseOutput);
+      }
+
+      submissions.add(submission);
+    }
+
+    return submissions;
+  }
+
+  private static String generateOutput(String studentId, int j) {
+    String output = "Output of " + studentId + "'s Test " + j;
+    if (j % 2 == 0) {
+      for (int i = 0; i < 100; i++) {
+        output += "\nq";
+      }
+
+    }
+
+    return output;
+  }
+
+
+  private static void usage(String message) {
+    PrintStream err = System.err;
+
+    err.println("** " + message);
+    err.println();
+    err.println("usage: java GenerateProjectSubmissionXmlFiles directoryName");
+    err.println("  directoryName      The name of the directory into which XML files should be generated");
+    err.println();
+
+    System.exit(1);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/InvalidFileContentException.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/InvalidFileContentException.java
new file mode 100644
index 000000000..ad939847f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/InvalidFileContentException.java
@@ -0,0 +1,10 @@
+package edu.pdx.cs410J.grader.scoring;
+
+/**
+ * Created by sushamkumar on 9/1/17.
+ */
+public class InvalidFileContentException extends Exception {
+    public InvalidFileContentException() { super("Out file is corrupted"); }
+    public InvalidFileContentException(String message) { super(message); }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
new file mode 100644
index 000000000..f73c8230f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -0,0 +1,84 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@XmlRootElement(name = "ProjectSubmission")
+public class ProjectSubmission {
+  private String projectName;
+  private String studentId;
+
+  @XmlElementWrapper
+  private final List<TestCaseOutput> testCaseOutputs = new ArrayList<>();
+  private double totalPoints;
+  private Double score;
+  private String studentName;
+  private Date submissionTime;
+  private Date gradedTime;
+
+
+
+  public Date getGradedTime() {return gradedTime;}
+
+  public void setGradedTime(Date gradedTime) {this.gradedTime = gradedTime;}
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setStudentId(String studentId) {
+    this.studentId = studentId;
+  }
+
+  public String getStudentId() {
+    return studentId;
+  }
+
+  public void addTestCaseOutput(TestCaseOutput testCaseOutput) {
+    this.testCaseOutputs.add(testCaseOutput);
+  }
+
+  public List<TestCaseOutput> getTestCaseOutputs() {
+    return testCaseOutputs;
+  }
+
+  public void setTotalPoints(double totalPoints) {
+    this.totalPoints = totalPoints;
+  }
+
+  public double getTotalPoints() {
+    return totalPoints;
+  }
+
+  public ProjectSubmission setScore(Double score) {
+    this.score = score;
+    return this;
+  }
+
+  public Double getScore() {
+    return score;
+  }
+
+  public String getStudentName() {
+    return studentName;
+  }
+
+  public void setStudentName(String studentName) {
+    this.studentName = studentName;
+  }
+
+  public Date getSubmissionTime() {
+    return submissionTime;
+  }
+
+  public void setSubmissionTime(Date submissionTime) {
+    this.submissionTime = submissionTime;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
new file mode 100644
index 000000000..cc87fc4f7
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
@@ -0,0 +1,116 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.nio.CharBuffer;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Author: Susham Kumar
+ */
+
+public class ProjectSubmissionOutputFileParser {
+
+    private final BufferedReader bufferedReader;
+    private static final String SUBMITTEDBY="Submitted by";
+    private static final String SUBMITTEDON="Submitted on";
+    private static final String GRADEDON="Graded on";
+
+
+  public ProjectSubmissionOutputFileParser(Reader source) {
+      if(source != null) {
+          bufferedReader = new BufferedReader(source);
+      }
+      else
+          throw new NullPointerException();
+
+  }
+
+  public ProjectSubmission parse() throws ParseException, IOException, InvalidFileContentException {
+
+     projectSubmission = new ProjectSubmission();
+     String fileContents=null;
+
+
+          while((fileContents= bufferedReader.readLine()) !=null) {
+            fileContents=fileContents.trim();
+          if(fileContents.contains("CS410J")){              // fileContents has the student Id and Project Name.
+              String[] splitContent=fileContents.split(Pattern.quote("."));
+              projectSubmission.setProjectName(splitContent[splitContent.length -1]);
+              projectSubmission.setStudentId(splitContent[splitContent.length -2]);
+
+            }
+
+            if(fileContents.contains(SUBMITTEDBY)){ //fileContents has StudentName
+             String [] splitContent=fileContents.split(SUBMITTEDBY);
+             projectSubmission.setStudentName(splitContent[splitContent.length -1].trim());
+            }
+
+            if(fileContents.contains(SUBMITTEDON)){ //fileContents has Submission Time
+                String [] splitContent=fileContents.split(SUBMITTEDON);
+                projectSubmission.setSubmissionTime(parseSubmissionTime(splitContent[splitContent.length -1].trim()));
+
+            }
+
+            if(fileContents.contains(GRADEDON)){ //fileContents has Graded Time
+                String [] splitContent=fileContents.split(GRADEDON);
+                projectSubmission.setGradedTime(parseGradingTime(splitContent[splitContent.length -1].trim()));
+            }
+
+            if(fileContents.contains("out of")){ //fileContents has Total Points and Awarded Points
+
+                  Pattern rightpattern = Pattern.compile("(?<=out of).*");
+                  Pattern leftpattern=Pattern.compile(".*(?=out of)");
+                  Matcher rightmatcher = rightpattern.matcher(fileContents);
+                  Matcher leftmatcher = leftpattern.matcher(fileContents);
+                  if (rightmatcher.find()) {
+                      projectSubmission.setTotalPoints(Double.parseDouble(rightmatcher.group().trim()));
+                  }
+                  else
+                  {
+                      throw new InvalidFileContentException("Not able to retrieve Total Points");
+                  }
+                  if(leftmatcher.find()){
+
+                      projectSubmission.setScore(Double.parseDouble(leftmatcher.group().trim()));
+                  }
+                  else {
+                      throw new InvalidFileContentException("Not able to retrieve the Score");
+                  }
+              }
+          }
+      return  projectSubmission;
+  }
+
+  public static Date parseSubmissionTime(String submissionTimeString) throws ParseException {
+
+    DateFormat format = new SimpleDateFormat("yyyy-MMM-dd HH:mm:ss");
+   Date date = format.parse(submissionTimeString);
+
+      return date;
+  }
+
+  public static Date parseGradingTime(String gradingTimeString) throws ParseException {
+      DateFormat gradingTimeFormat = new SimpleDateFormat("E MMM dd HH:mm:ss z yyyy");
+      String  test= gradingTimeFormat.format(new Date());
+      Date date = gradingTimeFormat.parse(gradingTimeString);
+
+      return date;
+  }
+
+
+    private ProjectSubmission projectSubmission;
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
new file mode 100644
index 000000000..ec2dcc033
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -0,0 +1,80 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+@Singleton
+public class ProjectSubmissionScorePresenter extends ScorePresenter {
+  private final ProjectSubmissionScoreView view;
+  private ProjectSubmission submission;
+
+  @Inject
+  public ProjectSubmissionScorePresenter(EventBus bus, ProjectSubmissionScoreView view) {
+    super(bus);
+    this.view = view;
+
+    this.view.addScoreChangedListener(this::setSubmissionScore);
+    this.view.addScoreSavedListener(this::publishSavedScoreMessage);
+  }
+
+  private void publishSavedScoreMessage() {
+    if (this.submission.getScore() == null) {
+      this.submission.setScore(this.submission.getTotalPoints());
+    }
+    ProjectSubmissionScoreSaved saved = new ProjectSubmissionScoreSaved(this.submission);
+    publishEvent(saved);
+  }
+
+  private void setSubmissionScore(String score) {
+    try {
+      Double value = getValidScoreValue(score);
+      this.submission.setScore(value);
+      this.view.setScoreIsValid(true);
+
+    } catch (InvalidScoreValue ex) {
+      this.view.setScoreIsValid(false);
+    }
+  }
+
+  @Override
+  protected boolean isScoreInValidRange(Double score) {
+    return score >= 0.0 && score <= this.submission.getTotalPoints();
+  }
+
+  @Subscribe
+  public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selected) {
+    submission = selected.getProjectSubmission();
+    Double score = submission.getScore();
+    if (score == null) {
+      score = submission.getTotalPoints();
+    }
+    this.view.setScore(format.format(score));
+    this.view.setScoreIsValid(true);
+
+    this.view.setTotalPoints(format.format(submission.getTotalPoints()));
+  }
+
+  @Subscribe
+  public void updateScoreWhenTestCaseOutputIsUpdate(TestCaseOutputUpdated updated) {
+    if (submission.getTestCaseOutputs().contains(updated.getTestCaseOutput())) {
+      double score = submission.getTotalPoints();
+      double totalPointsDeducted = submission.getTestCaseOutputs().stream().mapToDouble(this::getPointsDeducted).sum();
+      score -= totalPointsDeducted;
+      this.submission.setScore(score);
+      this.view.setScoreIsValid(true);
+      this.view.setScore(format.format(score));
+    }
+  }
+
+  private double getPointsDeducted(TestCaseOutput testCaseOutput) {
+    Double pointsDeducted = testCaseOutput.getPointsDeducted();
+    if (pointsDeducted == null) {
+      return 0.0;
+
+    } else {
+      return pointsDeducted.doubleValue();
+    }
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreSaved.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreSaved.java
new file mode 100644
index 000000000..2e1053099
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreSaved.java
@@ -0,0 +1,13 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class ProjectSubmissionScoreSaved {
+  private ProjectSubmission projectSubmission;
+
+  public ProjectSubmissionScoreSaved(ProjectSubmission submission) {
+    this.projectSubmission = submission;
+  }
+
+  public ProjectSubmission getProjectSubmission() {
+    return projectSubmission;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
new file mode 100644
index 000000000..e5c6e49c1
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
@@ -0,0 +1,21 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public interface ProjectSubmissionScoreView {
+  void setTotalPoints(String totalPoints);
+
+  void setScore(String score);
+
+  void addScoreChangedListener(ScoreChangedListener listener);
+
+  void setScoreIsValid(boolean scoreIsInvalid);
+
+  void addScoreSavedListener(ScoreSavedListener listener);
+
+  interface ScoreChangedListener {
+    void scoreChanged(String newScore);
+  }
+
+  interface ScoreSavedListener {
+    void submissionSaved();
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionSelected.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionSelected.java
new file mode 100644
index 000000000..6dda6c26d
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionSelected.java
@@ -0,0 +1,18 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class ProjectSubmissionSelected {
+  private final ProjectSubmission projectSubmission;
+
+  public ProjectSubmissionSelected(ProjectSubmission submission) {
+    this.projectSubmission = submission;
+  }
+
+  public ProjectSubmission getProjectSubmission() {
+    return projectSubmission;
+  }
+
+  @Override
+  public String toString() {
+    return "Selected project submission " + projectSubmission.getStudentId() + "/" + projectSubmission.getProjectName();
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
new file mode 100644
index 000000000..4b7cdb186
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
@@ -0,0 +1,97 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import java.io.*;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ProjectSubmissionXmlConverter {
+    private final JAXBContext xmlContext;
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public ProjectSubmissionXmlConverter() throws JAXBException {
+        xmlContext = JAXBContext.newInstance(ProjectSubmission.class);
+    }
+
+    public void convertToXml(ProjectSubmission submission, Writer writer) throws JAXBException {
+        Marshaller marshaller = this.xmlContext.createMarshaller();
+        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        marshaller.marshal(submission, writer);
+    }
+
+    public ProjectSubmission convertFromXml(Reader reader) throws JAXBException {
+        Unmarshaller unmarshaller = this.xmlContext.createUnmarshaller();
+        return (ProjectSubmission) unmarshaller.unmarshal(reader);
+    }
+
+    public static void main(String... args) throws JAXBException {
+        List<String> outFileNames = new ArrayList<>();
+        outFileNames.addAll(Arrays.asList(args));
+
+        if (outFileNames.isEmpty()) {
+            usage("Missing project submission out file name");
+        }
+
+        ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
+        outFileNames.stream().map(File::new).forEach(converter::convertOutFileToXml);
+}
+
+  private void convertOutFileToXml(File outFile) {
+
+     File xmlFile = null;
+    if (!outFile.exists()) {
+      logger.error("Output file \"" + outFile + "\" does not exist");
+      return;
+    }
+    try {
+
+    ProjectSubmissionOutputFileParser parser = new ProjectSubmissionOutputFileParser(new FileReader(outFile));
+    ProjectSubmission submission = parser.parse();
+
+    String outFileName = outFile.getName();
+    String filePrefix= outFileName.substring(outFileName.indexOf('.'));
+    String xmlFileName = filePrefix + ".xml";
+
+    File directory = outFile.getParentFile();
+    xmlFile = new File(directory, xmlFileName);
+
+
+      convertToXml(submission, new FileWriter(xmlFile));
+
+    }
+    catch (JAXBException | IOException e) {
+      logger.error("While writing to " + xmlFile, e);
+    }
+    catch (ParseException| InvalidFileContentException e) {
+      logger.error("Exception" + xmlFile, e);
+    }
+
+  }
+
+  private static void usage(String message) {
+    PrintStream err = System.err;
+    err.println("** " + message);
+    err.println();
+    err.println("usage: java ProjectSubmissionsXmlConverter outFileName+");
+    err.println("  outFileName    A project submission output file");
+    err.println();
+
+    System.exit(1);
+  }
+
+  @VisibleForTesting
+  String getXmlString(ProjectSubmission submission) throws JAXBException {
+    StringWriter sw = new StringWriter();
+    this.convertToXml(submission, sw);
+    return sw.toString();
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
new file mode 100644
index 000000000..8f0fc8749
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
@@ -0,0 +1,34 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.io.File;
+import java.util.List;
+
+public class ProjectSubmissionsLoaded {
+  private final List<LoadedProjectSubmission> submissions;
+
+  public ProjectSubmissionsLoaded(List<LoadedProjectSubmission> submissions) {
+    this.submissions = submissions;
+  }
+
+  public List<LoadedProjectSubmission> getLoadedSubmissions() {
+    return this.submissions;
+  }
+
+  public static class LoadedProjectSubmission {
+    private final File file;
+    private final ProjectSubmission submission;
+
+    public LoadedProjectSubmission(File file, ProjectSubmission submission) {
+      this.file = file;
+      this.submission = submission;
+    }
+
+    public ProjectSubmission getSubmission() {
+      return submission;
+    }
+
+    public File getFile() {
+      return file;
+    }
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
new file mode 100644
index 000000000..d86907f5f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
@@ -0,0 +1,120 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.EventBus;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
+
+import javax.xml.bind.JAXBException;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Singleton
+public class ProjectSubmissionsLoaderSaverPresenter extends PresenterOnEventBus {
+  public static final String CLICK_HERE_MESSAGE = "Click above to load submission files";
+  private final ProjectSubmissionsLoaderSaverView view;
+  private final ProjectSubmissionXmlConverter converter;
+  private final ProjectSubmissionXmlLoader xmlLoader;
+  private final ProjectSubmissionXmlWriter xmlWriter;
+  private List<LoadedProjectSubmission> loadedProjectSubmissions;
+
+  @Inject
+  public ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view) throws JAXBException {
+    this(bus, view, new ProjectSubmissionXmlLoader() {
+      @Override
+      public Reader getReader(File file) throws FileNotFoundException {
+        return new FileReader(file);
+      }
+
+      @Override
+      public List<File> getSubmissionFiles(File directory) {
+        File[] xmlFiles = directory.listFiles((dir, name) -> name.endsWith(".xml"));
+        return Arrays.asList(xmlFiles);
+      }
+    }, new ProjectSubmissionXmlWriter() {
+      @Override
+      public void writeXmlToFile(File file, String xml) throws IOException {
+        try (FileWriter writer = new FileWriter(file)) {
+          writer.write(xml);
+          writer.flush();
+        }
+      }
+    });
+  }
+
+  @VisibleForTesting
+  ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view,
+                                         ProjectSubmissionXmlLoader xmlLoader,
+                                         ProjectSubmissionXmlWriter xmlWriter) throws JAXBException {
+    super(bus);
+    this.view = view;
+    this.xmlLoader = xmlLoader;
+    this.xmlWriter = xmlWriter;
+
+    this.converter = new ProjectSubmissionXmlConverter();
+
+    this.view.addDirectorySelectedListener(this::loadSubmissionsFromDirectory);
+    this.view.addSaveSubmissionsListener(this::saveSubmissionsToXmlFiles);
+    this.view.setDisplayMessage(CLICK_HERE_MESSAGE);
+  }
+
+  private void saveSubmissionsToXmlFiles() {
+    loadedProjectSubmissions.forEach(this::saveSubmissionToXmlFile);
+  }
+
+  private void saveSubmissionToXmlFile(LoadedProjectSubmission submission) {
+    try {
+      String xml = this.converter.getXmlString(submission.getSubmission());
+      this.xmlWriter.writeXmlToFile(submission.getFile(), xml);
+
+    } catch (JAXBException | IOException e) {
+      throw new IllegalStateException("While saving XML", e);
+    }
+
+  }
+
+  private void loadSubmissionsFromDirectory(File directory) {
+    loadedProjectSubmissions = new ArrayList<>();
+    List<File> xmlFiles = getSubmissionFiles(directory);
+    for (File xmlFile : xmlFiles) {
+      ProjectSubmission submission = null;
+      try {
+        submission = this.converter.convertFromXml(getReader(xmlFile));
+      } catch (JAXBException | FileNotFoundException e) {
+        throw new IllegalStateException("While parsing XML", e);
+      }
+      loadedProjectSubmissions.add(new LoadedProjectSubmission(xmlFile, submission));
+    }
+
+    this.view.setDisplayMessage(loadedSubmissionsFrom(directory));
+    publishEvent(new ProjectSubmissionsLoaded(loadedProjectSubmissions));
+  }
+
+  private Reader getReader(File file) throws FileNotFoundException {
+    return this.xmlLoader.getReader(file);
+  }
+
+  private List<File> getSubmissionFiles(File directory) {
+    return this.xmlLoader.getSubmissionFiles(directory);
+  }
+
+  public static String loadedSubmissionsFrom(File testDirectory) {
+    return testDirectory.getAbsolutePath();
+  }
+
+  @VisibleForTesting
+  interface ProjectSubmissionXmlLoader {
+    Reader getReader(File file) throws FileNotFoundException;
+
+    List<File> getSubmissionFiles(File directory);
+  }
+
+  @VisibleForTesting
+  interface ProjectSubmissionXmlWriter {
+    void writeXmlToFile(File file, String xml) throws IOException;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
new file mode 100644
index 000000000..3b487513f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
@@ -0,0 +1,19 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.io.File;
+
+public interface ProjectSubmissionsLoaderSaverView {
+  void addDirectorySelectedListener(DirectorySelectedListener listener);
+
+  void addSaveSubmissionsListener(SaveSubmissionsListener listener);
+
+  void setDisplayMessage(String message);
+
+  interface DirectorySelectedListener {
+    void directorySelected(File directory);
+  }
+
+  interface SaveSubmissionsListener {
+    void onSaveSubmissions();
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
new file mode 100644
index 000000000..9f501fca4
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -0,0 +1,88 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public class ProjectSubmissionsPresenter extends PresenterOnEventBus {
+  private final ProjectSubmissionsView view;
+  private List<ProjectSubmission> submissions;
+  private List<ProjectSubmission> gradedSubmissions;
+  private List<ProjectSubmission> ungradedSubmissions;
+
+  @Inject
+  public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
+    super(bus);
+    this.view = view;
+
+    view.addUngradedSubmissionNameSelectedListener((selectedIndex) -> publishSubmissionSelected(selectedIndex, ungradedSubmissions));
+    view.addGradedSubmissionNameSelectedListener((selectedIndex) -> publishSubmissionSelected(selectedIndex, gradedSubmissions));
+  }
+
+  private void publishSubmissionSelected(int selectedIndex, List<ProjectSubmission> submissions) {
+    if (submissions != null && !submissions.isEmpty()) {
+      ProjectSubmission selected = submissions.get(selectedIndex);
+      publishEvent(new ProjectSubmissionSelected(selected));
+    }
+  }
+
+  @Subscribe
+  public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded) {
+    List<ProjectSubmission> list = new ArrayList<>();
+    loaded.getLoadedSubmissions().forEach(l -> {
+      list.add(l.getSubmission());
+    });
+    populateViewWithSubmissions(list);
+  }
+
+  private void populateViewWithSubmissions(List<ProjectSubmission> submissions) {
+    setSubmissions(submissions);
+
+    List<String> ungradedSubmissionNames = ungradedSubmissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
+    this.view.setUngradedProjectSubmissionNames(ungradedSubmissionNames);
+    this.view.setSelectedUngradedSubmission(0);
+
+    List<String> gradedSubmissionNames = gradedSubmissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
+    this.view.setGradedProjectSubmissionNames(gradedSubmissionNames);
+  }
+
+  @Subscribe
+  public void populateViewWithNamesOfUpdatedSubmissionsAndSelectFirstUngraded(ProjectSubmissionScoreSaved saved) {
+    if (this.submissions.contains(saved.getProjectSubmission())) {
+      populateViewWithSubmissions(this.submissions);
+      publishSubmissionSelected(0, this.ungradedSubmissions);
+    }
+  }
+
+  private void setSubmissions(List<ProjectSubmission> submissions) {
+    this.submissions = submissions;
+
+    gradedSubmissions = submissions.stream()
+      .filter(this::isGraded)
+      .collect(Collectors.toList());
+
+    ungradedSubmissions = submissions.stream()
+      .filter(((Predicate<ProjectSubmission>) this::isGraded).negate())
+      .collect(Collectors.toList());
+  }
+
+  private boolean isGraded(ProjectSubmission submission) {
+    return submission.getScore() != null;
+  }
+
+  private String getSubmissionName(ProjectSubmission submission) {
+    return getProjectSubmissionName(submission.getStudentId(), submission.getProjectName());
+  }
+
+  @VisibleForTesting
+  static String getProjectSubmissionName(String studentId, String projectName) {
+    return studentId + "/" + projectName;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
new file mode 100644
index 000000000..684334e20
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -0,0 +1,19 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.util.List;
+
+public interface ProjectSubmissionsView {
+  void setUngradedProjectSubmissionNames(List<String> submissionNames);
+
+  void addUngradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
+
+  void setSelectedUngradedSubmission(int index);
+
+  void setGradedProjectSubmissionNames(List<String> submissionNames);
+
+  void addGradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
+
+  interface SubmissionNameSelectedListener {
+    void submissionNameSelected(int index);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java
new file mode 100644
index 000000000..ca12cb1f5
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java
@@ -0,0 +1,45 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.EventBus;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+
+import java.text.NumberFormat;
+
+public abstract class ScorePresenter extends PresenterOnEventBus {
+  protected final NumberFormat format;
+
+  public ScorePresenter(EventBus bus) {
+    super(bus);
+
+    format = NumberFormat.getNumberInstance();
+    format.setMinimumFractionDigits(1);
+  }
+
+  protected Double getValidScoreValue(String score) throws InvalidScoreValue {
+    if ("".equals(score)) {
+      return null;
+
+    } else {
+      try {
+        Double value = Double.parseDouble(score);
+        if (isScoreInValidRange(value)) {
+          return value;
+
+        } else {
+          throw new InvalidScoreValue(score);
+        }
+
+      } catch (NumberFormatException ex) {
+        throw new InvalidScoreValue(score);
+      }
+    }
+  }
+
+  protected abstract boolean isScoreInValidRange(Double score);
+
+  protected class InvalidScoreValue extends Exception {
+    public InvalidScoreValue(String score) {
+      super(score);
+    }
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
new file mode 100644
index 000000000..17eaee522
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
@@ -0,0 +1,64 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class TestCaseOutput {
+  private String name;
+  private String description;
+  private String command;
+  private String output;
+  private Double pointsDeducted;
+  private String graderComment;
+
+  public TestCaseOutput setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public TestCaseOutput setDescription(String description) {
+    this.description = description;
+    return this;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public TestCaseOutput setCommand(String command) {
+    this.command = command;
+    return this;
+  }
+
+  public String getCommand() {
+    return command;
+  }
+
+  public TestCaseOutput setOutput(String output) {
+    this.output = output;
+    return this;
+  }
+
+  public String getOutput() {
+    return output;
+  }
+
+  public TestCaseOutput setPointsDeducted(Double pointsDeducted) {
+    this.pointsDeducted = pointsDeducted;
+    return this;
+  }
+
+  public Double getPointsDeducted() {
+    return pointsDeducted;
+  }
+
+  public TestCaseOutput setGraderComment(String graderComment) {
+    this.graderComment = graderComment;
+    return this;
+  }
+
+  public String getGraderComment() {
+    return graderComment;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
new file mode 100644
index 000000000..0417be8f5
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
@@ -0,0 +1,62 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+@Singleton
+public class TestCaseOutputPresenter extends ScorePresenter {
+  private final TestCaseOutputView view;
+  private TestCaseOutput testCase;
+
+  @Inject
+  public TestCaseOutputPresenter(EventBus bus, TestCaseOutputView view) {
+    super(bus);
+    this.view = view;
+
+    this.view.addPointsDeductedChangeListener(this::setPointsDeducted);
+    this.view.addGraderCommentChangeListener(this::storeGraderComment);
+  }
+
+  private void setPointsDeducted(String pointsDeducted) {
+    try {
+      Double value = getValidScoreValue(pointsDeducted);
+      this.testCase.setPointsDeducted(value);
+      publishEvent(new TestCaseOutputUpdated(this.testCase));
+
+      this.view.setPointsDeductedIsValid(true);
+
+    } catch (InvalidScoreValue ex) {
+      this.view.setPointsDeductedIsValid(false);
+    }
+
+  }
+
+  private void storeGraderComment(String comment) {
+    this.testCase.setGraderComment(comment);
+  }
+
+  @Subscribe
+  public void populateViewWhenTestCaseSelected(TestCaseSelected selected) {
+    testCase = selected.getTestCaseOutput();
+    view.setCommand(testCase.getCommand());
+    view.setDescription(testCase.getDescription());
+    view.setOutput(testCase.getOutput());
+    view.setGraderComment(testCase.getGraderComment());
+
+    Double pointsDeducted = testCase.getPointsDeducted();
+    if (pointsDeducted == null) {
+      view.setPointsDeducted("");
+
+    } else {
+      view.setPointsDeducted(format.format(pointsDeducted));
+    }
+    view.setPointsDeductedIsValid(true);
+  }
+
+  @Override
+  protected boolean isScoreInValidRange(Double score) {
+    return score > 0.0;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputUpdated.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputUpdated.java
new file mode 100644
index 000000000..4a0876de4
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputUpdated.java
@@ -0,0 +1,15 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class TestCaseOutputUpdated {
+
+  private final TestCaseOutput testCaseOutput;
+
+  public TestCaseOutputUpdated(TestCaseOutput testCase) {
+    this.testCaseOutput = testCase;
+
+  }
+
+  public TestCaseOutput getTestCaseOutput() {
+    return testCaseOutput;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
new file mode 100644
index 000000000..62dea5a8e
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
@@ -0,0 +1,27 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public interface TestCaseOutputView {
+  void setDescription(String description);
+
+  void setCommand(String command);
+
+  void setOutput(String output);
+
+  void setPointsDeducted(String pointsDeducted);
+
+  void addGraderCommentChangeListener(GraderCommentChangeListener listener);
+
+  void setGraderComment(String comment);
+
+  void addPointsDeductedChangeListener(PointsDeductedChangeListener listener);
+
+  void setPointsDeductedIsValid(boolean isValidPointsDeducted);
+
+  interface GraderCommentChangeListener {
+    void onGraderCommentChange(String comment);
+  }
+
+  interface PointsDeductedChangeListener {
+    void onPointsDeductedChange(String pointsDeducted);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseSelected.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseSelected.java
new file mode 100644
index 000000000..11bd6f73d
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseSelected.java
@@ -0,0 +1,18 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class TestCaseSelected {
+  private TestCaseOutput testCaseOutput;
+
+  public TestCaseSelected(TestCaseOutput selected) {
+    this.testCaseOutput = selected;
+  }
+
+  public TestCaseOutput getTestCaseOutput() {
+    return testCaseOutput;
+  }
+
+  @Override
+  public String toString() {
+    return "Selected test case " + testCaseOutput.getName();
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
new file mode 100644
index 000000000..48eee889a
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -0,0 +1,71 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Singleton
+public class TestCasesPresenter extends PresenterOnEventBus {
+  private final TestCasesView view;
+  private List<TestCaseOutput> testCaseOutputs;
+
+  @Inject
+  public TestCasesPresenter(EventBus bus, TestCasesView view) {
+    super(bus);
+    this.view = view;
+
+    this.view.addTestCaseNameSelectedListener(this::publishTestCaseNameSelectedEvent);
+  }
+
+  private void publishTestCaseNameSelectedEvent(int index) {
+    TestCaseOutput selected = this.testCaseOutputs.get(index);
+    publishEvent(new TestCaseSelected(selected));
+  }
+
+  @Subscribe
+  public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selected) {
+    testCaseOutputs = selected.getProjectSubmission().getTestCaseOutputs();
+    setTestCaseNamesInView();
+
+    view.setSelectedTestCaseName(0);
+  }
+
+  private void setTestCaseNamesInView() {
+    List<String> testCaseNames = testCaseOutputs.stream().map(this::getDisplay).collect(Collectors.toList());
+    view.setTestCaseNames(testCaseNames);
+  }
+
+  private String getDisplay(TestCaseOutput testCase) {
+    return formatTestCase(testCase.getName(), testCase.getPointsDeducted());
+  }
+
+  @Subscribe
+  public void repopulateViewAndSelectNextTestCaseWhenTestCaseOutputIsUpdated(TestCaseOutputUpdated update) {
+    int index = this.testCaseOutputs.indexOf(update.getTestCaseOutput());
+    if (index >= 0) {
+      setTestCaseNamesInView();
+      if (index < this.testCaseOutputs.size() - 1) {
+        int nextIndex = index + 1;
+        this.view.setSelectedTestCaseName(nextIndex);
+        TestCaseOutput next = this.testCaseOutputs.get(nextIndex);
+        publishEvent(new TestCaseSelected(next));
+      }
+    }
+  }
+
+  @VisibleForTesting
+  static String formatTestCase(String testCaseName, Double pointsDeducted) {
+    if (pointsDeducted == null || pointsDeducted == 0.0) {
+      return testCaseName;
+
+    } else {
+      return testCaseName + " (-" + pointsDeducted + ")";
+    }
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
new file mode 100644
index 000000000..7b174e2a8
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
@@ -0,0 +1,15 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.util.List;
+
+public interface TestCasesView {
+  void setTestCaseNames(List<String> testCaseNames);
+
+  void setSelectedTestCaseName(int index);
+
+  void addTestCaseNameSelectedListener(TestCaseNameSelectedListener listener);
+
+  interface TestCaseNameSelectedListener {
+    void testCaseNameSelected(int index);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/JPanelWithJList.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/JPanelWithJList.java
new file mode 100644
index 000000000..91b39fdeb
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/JPanelWithJList.java
@@ -0,0 +1,23 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import java.util.function.Consumer;
+
+public class JPanelWithJList extends JPanel {
+
+  private boolean isFinalEventInUserSelection(ListSelectionEvent e) {
+    return !e.getValueIsAdjusting();
+  }
+
+  protected void registerListenerOnListItemSelection(JList<String> list, Consumer<Integer> onSelection) {
+    list.addListSelectionListener(e -> {
+      if (isFinalEventInUserSelection(e)) {
+        int selectedIndex = list.getSelectedIndex();
+        if (selectedIndex >= 0) {
+          onSelection.accept(selectedIndex);
+        }
+      }
+    });
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
new file mode 100644
index 000000000..f022ade9a
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
@@ -0,0 +1,51 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView;
+
+import javax.swing.*;
+
+@Singleton
+public class ProjectSubmissionScorePanel extends ScorePanel implements ProjectSubmissionScoreView {
+  private final JLabel totalPoints;
+  private final JTextField score;
+  private final JButton saveScore;
+
+  public ProjectSubmissionScorePanel() {
+    totalPoints = new JLabel();
+    score = new JTextField(3);
+    saveScore = new JButton("Save Score");
+
+    this.add(new JLabel("Total score for submission:"));
+    this.add(score);
+    this.add(new JLabel("out of"));
+    this.add(totalPoints);
+    this.add(saveScore);
+  }
+
+  @Override
+  public void setTotalPoints(String totalPoints) {
+    this.totalPoints.setText(totalPoints);
+  }
+
+  @Override
+  public void setScore(String score) {
+    this.score.setText(score);
+  }
+
+  @Override
+  public void addScoreChangedListener(ScoreChangedListener listener) {
+    registerListenerOnTextFieldChange(this.score, listener::scoreChanged);
+  }
+
+  @Override
+  public void setScoreIsValid(boolean scoreIsValid) {
+    setBorderBasedOnValidity(this.score, scoreIsValid);
+  }
+
+  @Override
+  public void addScoreSavedListener(ScoreSavedListener listener) {
+    saveScore.addActionListener(e -> listener.submissionSaved());
+  }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
new file mode 100644
index 000000000..9ab0e491b
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
@@ -0,0 +1,38 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.common.eventbus.EventBus;
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionPresenter;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionView;
+import edu.pdx.cs410J.grader.mvp.ui.UnhandledExceptionDialog;
+import edu.pdx.cs410J.grader.scoring.*;
+
+public class ProjectSubmissionScorerUIModule extends AbstractModule {
+  @Override
+  protected void configure() {
+
+    bind(ProjectSubmissionsView.class).to(ProjectSubmissionsPanel.class);
+    bind(TestCasesView.class).to(TestCasesPanel.class);
+    bind(TestCaseOutputView.class).to(TestCaseOutputPanel.class);
+    bind(ProjectSubmissionScoreView.class).to(ProjectSubmissionScorePanel.class);
+    bind(ProjectSubmissionsLoaderSaverView.class).to(ProjectSubmissionsLoaderSaverPanel.class);
+    bind(UnhandledExceptionView.class).to(UnhandledExceptionDialog.class).asEagerSingleton();
+
+    bind(ProjectSubmissionsPresenter.class).asEagerSingleton();
+    bind(TestCasesPresenter.class).asEagerSingleton();
+    bind(TestCaseOutputPresenter.class).asEagerSingleton();
+    bind(ProjectSubmissionScorePresenter.class).asEagerSingleton();
+    bind(UnhandledExceptionPresenter.class).asEagerSingleton();
+    bind(ProjectSubmissionsLoaderSaverPresenter.class).asEagerSingleton();
+  }
+
+  @Provides
+  @Singleton
+  public EventBus provideEventBus() {
+    return new EventBusThatPublishesUnhandledExceptionEvents();
+  }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
new file mode 100644
index 000000000..6aff03fb9
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
@@ -0,0 +1,97 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+@Singleton
+public class ProjectSubmissionsLoaderSaverPanel extends JPanel implements ProjectSubmissionsLoaderSaverView {
+
+  private final TopLevelJFrame parent;
+  private final List<DirectorySelectedListener> loadListeners = new ArrayList<>();
+  private ArrayList<SaveSubmissionsListener> saveListeners = new ArrayList<>();
+  private final JLabel message;
+
+  @Inject
+  public ProjectSubmissionsLoaderSaverPanel(TopLevelJFrame parent) {
+    this.parent = parent;
+    this.setLayout(new BorderLayout());
+
+    JPanel buttons = new JPanel();
+
+    JButton load = new JButton("Load XML files");
+    load.addActionListener(this::showDirectoryChooser);
+    buttons.add(load);
+
+    JButton save = new JButton("Save XML files");
+    save.addActionListener(this::saveXmlFiles);
+    buttons.add(save);
+
+    this.add(buttons, BorderLayout.NORTH);
+
+    message = new JLabel();
+    this.add(message, BorderLayout.SOUTH);
+  }
+
+  private void saveXmlFiles(ActionEvent event) {
+    this.saveListeners.forEach(SaveSubmissionsListener::onSaveSubmissions);
+  }
+
+  private void showDirectoryChooser(ActionEvent Event) {
+    JFileChooser chooser = getFileChooser();
+    int response = chooser.showOpenDialog(parent);
+
+    if (response == JFileChooser.APPROVE_OPTION) {
+      File file = chooser.getSelectedFile();
+      loadFromDirectory(file);
+    }
+  }
+
+  private void loadFromDirectory(File directory) {
+    this.loadListeners.forEach(l -> l.directorySelected(directory));
+  }
+
+  private JFileChooser getFileChooser() {
+    JFileChooser chooser = new JFileChooser();
+    chooser.setDialogTitle("Choose a directory containing submission XML files");
+//    chooser.setFileFilter(new FileFilter() {
+//      @Override
+//      public boolean accept(File f) {
+//        return f.isDirectory() || f.getName().endsWith(".xml");
+//      }
+//
+//      @Override
+//      public String getDescription() {
+//        return "Directory or .xml files";
+//      }
+//    });
+    chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+    chooser.setAcceptAllFileFilterUsed(false);
+    chooser.setDialogType(JFileChooser.OPEN_DIALOG);
+
+    return chooser;
+  }
+
+  @Override
+  public void addDirectorySelectedListener(DirectorySelectedListener listener) {
+    this.loadListeners.add(listener);
+  }
+
+  @Override
+  public void addSaveSubmissionsListener(SaveSubmissionsListener listener) {
+    this.saveListeners.add(listener);
+  }
+
+  @Override
+  public void setDisplayMessage(String message) {
+    this.message.setText(message);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
new file mode 100644
index 000000000..2185f957a
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -0,0 +1,60 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.List;
+import java.util.Vector;
+
+@Singleton
+public class ProjectSubmissionsPanel extends JPanelWithJList implements ProjectSubmissionsView {
+
+  private final JList<String> ungradedSubmissionNames;
+  private final JList<String> gradedSubmissionNames;
+
+  public ProjectSubmissionsPanel() {
+    ungradedSubmissionNames = new JList<>();
+    ungradedSubmissionNames.setVisibleRowCount(15);
+
+    gradedSubmissionNames = new JList<>();
+    gradedSubmissionNames.setVisibleRowCount(15);
+
+    this.setLayout(new BorderLayout());
+
+    JScrollPane ungradedScroll = new JScrollPane(ungradedSubmissionNames);
+    ungradedScroll.setBorder(BorderFactory.createTitledBorder("Ungraded Submissions"));
+    this.add(ungradedScroll, BorderLayout.NORTH);
+
+    JScrollPane gradedScroll = new JScrollPane(gradedSubmissionNames);
+    gradedScroll.setBorder(BorderFactory.createTitledBorder("Graded Submissions"));
+    this.add(gradedScroll, BorderLayout.SOUTH);
+  }
+
+  @Override
+  public void setUngradedProjectSubmissionNames(List<String> submissionNames) {
+    this.ungradedSubmissionNames.setListData(new Vector<>(submissionNames));
+  }
+
+  @Override
+  public void addUngradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
+    registerListenerOnListItemSelection(this.ungradedSubmissionNames, listener::submissionNameSelected);
+  }
+
+  @Override
+  public void setSelectedUngradedSubmission(int index) {
+    this.ungradedSubmissionNames.setSelectedIndex(index);
+  }
+
+  @Override
+  public void setGradedProjectSubmissionNames(List<String> submissionNames) {
+    this.gradedSubmissionNames.setListData(new Vector<>(submissionNames));
+  }
+
+  @Override
+  public void addGradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
+    registerListenerOnListItemSelection(this.gradedSubmissionNames, listener::submissionNameSelected);
+  }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
new file mode 100644
index 000000000..3b0ce9d3f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
@@ -0,0 +1,70 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import ch.qos.logback.classic.Level;
+import com.google.common.eventbus.EventBus;
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
+import edu.pdx.cs410J.grader.mvp.ui.UIMain;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.TestCaseOutput;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.*;
+import java.awt.*;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+@Singleton
+public class ProjectSubmissionsScorer extends UIMain {
+  private static final Logger logger = LoggerFactory.getLogger(ProjectSubmissionsScorer.class);
+
+  @Inject
+  public ProjectSubmissionsScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases,
+                                  TestCaseOutputPanel testCaseOutput, ProjectSubmissionScorePanel score,
+                                  ProjectSubmissionsLoaderSaverPanel loadAndSave) {
+    super(parent);
+
+    parent.setTitle("Project Submission Scorer");
+
+    Container content = parent.getContentPane();
+    content.setLayout(new BorderLayout());
+
+    JPanel submissionsAndTestCases = new JPanel(new BorderLayout());
+    submissionsAndTestCases.add(loadAndSave, BorderLayout.NORTH);
+    submissionsAndTestCases.add(submissions, BorderLayout.WEST);
+    submissionsAndTestCases.add(testCases, BorderLayout.EAST);
+
+    content.add(submissionsAndTestCases, BorderLayout.WEST);
+
+    JPanel scoreAndOutput = new JPanel(new BorderLayout());
+    scoreAndOutput.add(score, BorderLayout.NORTH);
+    scoreAndOutput.add(testCaseOutput, BorderLayout.CENTER);
+
+    content.add(scoreAndOutput, BorderLayout.CENTER);
+  }
+
+  static void setLoggingLevelToDebug() {
+    ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger("edu.pdx.cs410J.grader");
+    logger.setLevel(Level.DEBUG);
+  }
+
+  public static void main(String[] args) {
+    setLoggingLevelToDebug();
+    logAllUncaughtExceptions(logger);
+
+    Injector injector = Guice.createInjector(new ProjectSubmissionScorerUIModule());
+
+    EventBus bus = injector.getInstance(EventBus.class);
+    logAllEventsOnBusAtDebugLevel(bus, logger);
+
+    ProjectSubmissionsScorer scorer = injector.getInstance(ProjectSubmissionsScorer.class);
+    scorer.display();
+  }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ScorePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ScorePanel.java
new file mode 100644
index 000000000..48af8d1bb
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ScorePanel.java
@@ -0,0 +1,28 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.util.function.Consumer;
+
+public abstract class ScorePanel extends JPanel {
+  protected void registerListenerOnTextFieldChange(final JTextField field, final Consumer<String> consume) {
+    field.addActionListener(e -> consume.accept(field.getText()));
+    field.addFocusListener(new FocusAdapter() {
+      @Override
+      public void focusLost(FocusEvent e) {
+        consume.accept(field.getText());
+      }
+    });
+  }
+
+  protected void setBorderBasedOnValidity(JTextField field, boolean isValid) {
+    if (isValid) {
+      field.setBorder(BorderFactory.createEmptyBorder());
+
+    } else {
+      field.setBorder(BorderFactory.createLineBorder(Color.red, 2));
+    }
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
new file mode 100644
index 000000000..8b95e2b60
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
@@ -0,0 +1,91 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.TestCaseOutputView;
+
+import javax.swing.*;
+import java.awt.*;
+
+@Singleton
+public class TestCaseOutputPanel extends ScorePanel implements TestCaseOutputView {
+
+  private final JLabel description;
+  private final JLabel command;
+  private final JTextArea output;
+  private final JTextField pointsDeducted;
+  private final JTextField graderComment;
+
+  public TestCaseOutputPanel() {
+    description = new JLabel();
+    description.setHorizontalAlignment(SwingConstants.CENTER);
+
+    command = new JLabel();
+
+    output = new JTextArea();
+    output.setEditable(false);
+
+    pointsDeducted = new JTextField(3);
+    graderComment = new JTextField(20);
+
+
+    this.setLayout(new BorderLayout());
+
+    JPanel north = new JPanel();
+    north.setLayout(new BoxLayout(north, BoxLayout.PAGE_AXIS));
+    north.add(description);
+    north.add(Box.createVerticalStrut(5));
+    north.add(command);
+    this.add(north, BorderLayout.NORTH);
+
+    this.add(new JScrollPane(output), BorderLayout.CENTER);
+
+    JPanel feedback = new JPanel();
+    feedback.setLayout(new BoxLayout(feedback, BoxLayout.LINE_AXIS));
+    feedback.add(new JLabel("Points Deducted: "));
+    feedback.add(pointsDeducted);
+    feedback.add(new JLabel("Grader Comment: "));
+    feedback.add(graderComment);
+
+    this.add(feedback, BorderLayout.SOUTH);
+  }
+
+  @Override
+  public void setDescription(String description) {
+    this.description.setText(description);
+  }
+
+  @Override
+  public void setCommand(String command) {
+    this.command.setText(command);
+  }
+
+  @Override
+  public void setOutput(String output) {
+    this.output.setText(output);
+  }
+
+  @Override
+  public void setPointsDeducted(String pointsDeducted) {
+    this.pointsDeducted.setText(pointsDeducted);
+  }
+
+  @Override
+  public void addGraderCommentChangeListener(GraderCommentChangeListener listener) {
+    registerListenerOnTextFieldChange(this.graderComment, listener::onGraderCommentChange);
+  }
+
+  @Override
+  public void setGraderComment(String comment) {
+    this.graderComment.setText(comment);
+  }
+
+  @Override
+  public void addPointsDeductedChangeListener(PointsDeductedChangeListener listener) {
+    registerListenerOnTextFieldChange(this.pointsDeducted, listener::onPointsDeductedChange);
+  }
+
+  @Override
+  public void setPointsDeductedIsValid(boolean isValidPointsDeducted) {
+    setBorderBasedOnValidity(this.pointsDeducted, isValidPointsDeducted);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
new file mode 100644
index 000000000..a9da2e6ac
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
@@ -0,0 +1,41 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.TestCasesView;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.List;
+import java.util.Vector;
+
+@Singleton
+public class TestCasesPanel extends JPanelWithJList implements TestCasesView{
+  private final JList<String> testCaseNames;
+
+  public TestCasesPanel() {
+    testCaseNames = new JList<>();
+    testCaseNames.setVisibleRowCount(20);
+
+    this.setLayout(new BorderLayout());
+
+    JScrollPane scroll = new JScrollPane(testCaseNames);
+    scroll.setBorder(BorderFactory.createTitledBorder("Test Cases"));
+    this.add(scroll, BorderLayout.CENTER);
+  }
+
+  @Override
+  public void setTestCaseNames(List<String> testCaseNames) {
+    this.testCaseNames.setListData(new Vector<>(testCaseNames));
+    this.updateUI();
+  }
+
+  @Override
+  public void setSelectedTestCaseName(int index) {
+    this.testCaseNames.setSelectedIndex(index);
+  }
+
+  @Override
+  public void addTestCaseNameSelectedListener(TestCaseNameSelectedListener listener) {
+    registerListenerOnListItemSelection(this.testCaseNames, listener::testCaseNameSelected);
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EventBusTestCase.java b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
similarity index 90%
rename from grader/src/test/java/edu/pdx/cs410J/grader/poa/EventBusTestCase.java
rename to grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
index 91156f8fc..c058a2982 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EventBusTestCase.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -38,4 +38,7 @@ protected void doNotFailTestWhenUnhandledExceptionEncountered(UnhandledException
 
   }
 
+  protected void publishEvent(Object event) {
+    this.bus.post(event);
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEventTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEventTest.java
similarity index 98%
rename from grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEventTest.java
rename to grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEventTest.java
index c3fda3d56..b4b44a76a 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEventTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEventTest.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenterTest.java
similarity index 97%
rename from grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenterTest.java
rename to grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenterTest.java
index 6d7698070..dbdee6485 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenterTest.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import org.junit.Test;
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
index 09eb50128..8e769688d 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
@@ -1,6 +1,7 @@
 package edu.pdx.cs410J.grader.poa;
 
 import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -28,7 +29,7 @@ public void setUp() {
 
   @Test
   public void downloadingSubmissionsDisplaysEmailCredentialsView() {
-    this.bus.post(new DownloadPOASubmissionsRequest());
+    publishEvent(new DownloadPOASubmissionsRequest());
 
     verify(this.view).setIsVisible(true);
   }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
index 26b107cbc..17ae51f64 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
@@ -3,6 +3,8 @@
 import com.google.common.eventbus.Subscribe;
 import edu.pdx.cs410J.ParserException;
 import edu.pdx.cs410J.grader.*;
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionEvent;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -32,7 +34,7 @@ public void gradeBookLoadedOnLoadGradeBookEvent() throws IOException {
     GradeBookLoadedHandler handler = mock(GradeBookLoadedHandler.class);
     this.bus.register(handler);
 
-    this.bus.post(new LoadGradeBook(file));
+    publishEvent(new LoadGradeBook(file));
 
     ArgumentCaptor<GradeBookLoaded> event = ArgumentCaptor.forClass(GradeBookLoaded.class);
     verify(handler).handle(event.capture());
@@ -64,7 +66,7 @@ public void unhandledExceptionEventPublishedWhenLoadingBadGradeBook() throws IOE
 
     this.unhandledExceptionHandler = this::doNotFailTestWhenUnhandledExceptionEncountered;
 
-    this.bus.post(new LoadGradeBook(badFile));
+    publishEvent(new LoadGradeBook(badFile));
 
     ArgumentCaptor<UnhandledExceptionEvent> event = ArgumentCaptor.forClass(UnhandledExceptionEvent.class);
     verify(handler).handle(event.capture());
@@ -85,7 +87,7 @@ public void gradeBookSavedToFileOnSaveGradeBookEvent() throws IOException, Parse
     GradeBookLoadedHandler handler = mock(GradeBookLoadedHandler.class);
     this.bus.register(handler);
 
-    this.bus.post(new LoadGradeBook(file));
+    publishEvent(new LoadGradeBook(file));
 
     ArgumentCaptor<GradeBookLoaded> event = ArgumentCaptor.forClass(GradeBookLoaded.class);
     verify(handler).handle(event.capture());
@@ -94,7 +96,7 @@ public void gradeBookSavedToFileOnSaveGradeBookEvent() throws IOException, Parse
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
 
-    this.bus.post(new SaveGradeBook(book));
+    publishEvent(new SaveGradeBook(book));
 
     book = readGradeBookFromFile(file);
     assertThat(book.getAssignmentNames(), contains(poa.getName()));
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
index 8a0e0aa24..86877abf0 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
@@ -5,6 +5,7 @@
 import edu.pdx.cs410J.grader.Grade;
 import edu.pdx.cs410J.grader.GradeBook;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -33,7 +34,7 @@ public void setUp() {
   public void gradeBookNameDisplayedWhenLoaded() {
     String className = "Test Class";
     GradeBook book = new GradeBook(className);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(view).setGradeBookName(className);
   }
@@ -68,11 +69,11 @@ public void gradeBookIsUpdatedOnRecordGradeEventForLateSubmission() {
     book.addStudent(student);
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     boolean isLate = true;
     double score = 0.5;
-    this.bus.post(new RecordGradeEvent(score, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(score, student, poa, isLate));
 
     Grade grade = student.getGrade(poa.getName());
     assertThat(grade, notNullValue());
@@ -88,11 +89,11 @@ public void gradeBookIsUpdatedOnRecordGradeEventForOnTimeSubmission() {
     book.addStudent(student);
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     boolean isLate = false;
     double score = 0.6;
-    this.bus.post(new RecordGradeEvent(score, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(score, student, poa, isLate));
 
     Grade grade = student.getGrade(poa.getName());
     assertThat(grade, notNullValue());
@@ -108,11 +109,11 @@ public void gradeBookIsUpdatedOnRecordGradeEventForExistingGrade() {
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
     student.setGrade(poa, 0.9);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     boolean isLate = false;
     double newScore = 0.6;
-    this.bus.post(new RecordGradeEvent(newScore, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(newScore, student, poa, isLate));
 
     Grade grade = student.getGrade(poa.getName());
     assertThat(grade, notNullValue());
@@ -128,13 +129,13 @@ public void recordingGradeEnablesSaveGradeBookInView() {
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
     student.setGrade(poa, 0.9);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(view).canSaveGradeBook(false);
 
     boolean isLate = false;
     double newScore = 0.6;
-    this.bus.post(new RecordGradeEvent(newScore, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(newScore, student, poa, isLate));
 
     verify(view).canSaveGradeBook(true);
   }
@@ -150,7 +151,7 @@ public void savingGradeBookInViewPublishesSaveGradeBookEvent() throws IOExceptio
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
     student.setGrade(poa, 0.9);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     SaveGradeBookEventHandler eventHandler = mock(SaveGradeBookEventHandler.class);
     bus.register(eventHandler);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java
index fd3391d70..a23f7ee77 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java
@@ -44,7 +44,7 @@ public void setUp() {
 
   @Test
   public void assignmentListPopulatedInViewWhenGradeBookLoaded() {
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setAssignments(Arrays.asList("POA 0", "POA 1", "POA 2"));
     verify(this.view).setSelectedAssignment(0);
@@ -58,7 +58,7 @@ public void assignmentSelectedFireWhenAssignmentSelectedInView() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().assignmentSelected(1);
 
@@ -79,7 +79,7 @@ public void initiallySelectAssignmentWhoseDueDateHasMostRecentlyPassed() {
     assignment1.setDueDate(LocalDateTime.now().minusDays(2));
     assignment2.setDueDate(LocalDateTime.now().plusDays(2));
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setSelectedAssignment(1);
   }
@@ -90,10 +90,10 @@ public void selectAssignmentWhenPOASubmittedWithAssignmentNumberInSubject() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     POASubmission submission = createPOASubmission("POA for Project 2", "me", LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setSelectedAssignment(2);
 
@@ -117,7 +117,7 @@ public void populateDueDateInViewWhenGradeBookLoaded() {
     assignment1.setDueDate(LocalDateTime.now().minusDays(2));
     assignment2.setDueDate(LocalDateTime.now().plusDays(2));
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setSelectedAssignmentDueDate(POAAssignmentsPresenter.formatDueDate(assignment1));
   }
@@ -133,7 +133,7 @@ public void populateDueDateInViewWhenAssignmentSelected() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
     verify(this.view).setSelectedAssignmentDueDate(POAAssignmentsPresenter.formatDueDate(assignment0));
 
     viewHandler.getValue().assignmentSelected(1);
@@ -152,7 +152,7 @@ public void clearDueDateInViewWhenAssignmentHasNoDueDate() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
     verify(this.view).setSelectedAssignmentDueDate(POAAssignmentsPresenter.formatDueDate(assignment0));
 
     viewHandler.getValue().assignmentSelected(1);
@@ -162,7 +162,7 @@ public void clearDueDateInViewWhenAssignmentHasNoDueDate() {
 
   @Test
   public void noAssignmentSelectedWhenGradeBookHasNoPOAAssignments() {
-    this.bus.post(new GradeBookLoaded(new GradeBook("No POA assignments")));
+    publishEvent(new GradeBookLoaded(new GradeBook("No POA assignments")));
 
     verify(this.view, never()).setAssignments(anyList());
     verify(this.view, never()).setSelectedAssignment(anyInt());
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java
index 86ffe113a..70cc9fb75 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java
@@ -57,7 +57,7 @@ public void setUp() {
 
   @Test
   public void onlySubmissionSelectedDisablesView() {
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verifyIsLate(false);
     verify(this.view).setIsEnabled(eq(false));
@@ -69,7 +69,7 @@ private void verifyIsLate(boolean isLate) {
 
   @Test
   public void onlyStudentSelectedDisablesView() {
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
 
     verifyIsLate(false);
     verify(this.view).setIsEnabled(eq(false));
@@ -77,8 +77,8 @@ public void onlyStudentSelectedDisablesView() {
 
   @Test
   public void onlyAssignmentSelectedDisablesView() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verifyIsLate(false);
     verify(this.view).setIsEnabled(eq(false));
@@ -150,8 +150,8 @@ public void latePOAIsStoredInPresenterWhenMarkedLateInView() {
   public void assignmentTotalPointsDisplayedInViewWhenAssignmentSelected() {
     double points = 2.75;
     assignment.setPoints(points);
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view).setTotalPoints("2.75");
   }
@@ -172,8 +172,8 @@ public void setPresentersScoreFromView() {
     ArgumentCaptor<ScoreValueHandler> handler = ArgumentCaptor.forClass(ScoreValueHandler.class);
     verify(view).addScoreValueHandler(handler.capture());
 
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment.setPoints(2.0d)));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment.setPoints(2.0d)));
     reset(this.view);
 
     handler.getValue().scoreValue("1.75");
@@ -202,7 +202,7 @@ public void errorStateShouldBeClearedWhenNewSubmissionIsSelected() {
 
     verify(this.view).setErrorInScore(true);
 
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setErrorInScore(false);
   }
@@ -214,7 +214,7 @@ public void scoreShouldBeClearedWhenNewSubmissionIsSelected() {
 
     handler.getValue().scoreValue("-4.3");
 
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setScore("");
     assertThat(this.presenter.getScore(), nullValue());
@@ -228,7 +228,7 @@ public void scoreAndErrorShouldBeClearedWhenNewStudentIsSelected() {
     handler.getValue().scoreValue("-4.3");
     verify(this.view).setErrorInScore(true);
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
 
     verify(this.view).setErrorInScore(false);
     verify(this.view, times(2)).setScore("");
@@ -243,8 +243,8 @@ public void scoreAndErrorShouldBeClearedWhenNewAssignmentIsSelected() {
     handler.getValue().scoreValue("-4.3");
     verify(this.view).setErrorInScore(true);
 
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view, times(2)).setErrorInScore(false);
     verify(this.view).setScore(formatTotalPoints(assignment.getPoints()));
@@ -259,10 +259,10 @@ public void scoreDefaultsToTotalPoints() {
   }
 
   private void postEventsToBus() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new POASubmissionSelected(submission));
-    this.bus.post(new StudentSelectedEvent(student));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new POASubmissionSelected(submission));
+    publishEvent(new StudentSelectedEvent(student));
+    publishEvent(new AssignmentSelectedEvent(assignment));
   }
 
   @Test
@@ -281,8 +281,8 @@ public void aScoreThatIsGreaterThanTheTotalPointsShouldBeAnError() {
     ArgumentCaptor<ScoreValueHandler> handler = ArgumentCaptor.forClass(ScoreValueHandler.class);
     verify(view).addScoreValueHandler(handler.capture());
 
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     handler.getValue().scoreValue(String.valueOf(assignment.getPoints() + 1.0d));
 
@@ -302,16 +302,16 @@ public void scoreDefaultsToCurrentGrade() {
 
   @Test
   public void scoreDefaultsToTotalPointsWhenNoStudentIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view).setScore(formatTotalPoints(assignment.getPoints()));
   }
 
   @Test
   public void scoreHasNotBeenRecordedWhenNoStudentIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view, times(2)).setScoreHasBeenRecorded(false);
   }
@@ -337,14 +337,14 @@ public void scoreHasBeenRecordedForSelectedStudentWhenItIsInGradeBook() {
 
   @Test
   public void scoreHasBeenRecordedShouldBeFalseWhenNewSubmissionIsSelected() {
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setScoreHasBeenRecorded(false);
   }
 
   @Test
   public void scoreHasBeenRecordedShouldBeFalseWhenNewStudentIsSelected() {
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
 
     verify(this.view, times(2)).setScoreHasBeenRecorded(false);
   }
@@ -408,14 +408,14 @@ private interface RecordGradeEventHandler {
 
   @Test
   public void currentGradeIsDisplayedWhenGradedSubmissionIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new POASubmissionSelected(submissionForPOAWithGrade));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new POASubmissionSelected(submissionForPOAWithGrade));
     verify(this.view).setScore("");
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
     verify(this.view, times(3)).setScore("");
 
-    this.bus.post(new AssignmentSelectedEvent(assignmentWithPOAGrade));
+    publishEvent(new AssignmentSelectedEvent(assignmentWithPOAGrade));
 
     InOrder inOrder = inOrder(this.view);
     inOrder.verify(this.view).setScore(formatTotalPoints(scoreForPOAWithGrade));
@@ -423,19 +423,19 @@ public void currentGradeIsDisplayedWhenGradedSubmissionIsSelected() {
 
   @Test
   public void currentGradeIsDisplayedWhenStudentIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new POASubmissionSelected(submissionForPOAWithGrade));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new POASubmissionSelected(submissionForPOAWithGrade));
     verify(this.view, times(1)).setScore("");
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
     verify(this.view, times(3)).setScore("");
 
-    this.bus.post(new AssignmentSelectedEvent(assignmentWithPOAGrade));
+    publishEvent(new AssignmentSelectedEvent(assignmentWithPOAGrade));
 
     InOrder inOrder = inOrder(this.view);
     inOrder.verify(this.view).setScore(formatTotalPoints(scoreForPOAWithGrade));
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
     inOrder.verify(this.view).setScore(formatTotalPoints(scoreForPOAWithGrade));
   }
 
@@ -445,7 +445,7 @@ public void unknownStudentClearsUI() {
     verify(this.view, times(4)).setScore("");
     verifyIsLate(3, false);
 
-    this.bus.post(new StudentSelectedEvent(null));
+    publishEvent(new StudentSelectedEvent(null));
 
     verify(this.view, times(5)).setScore("");
     verifyIsLate(4, false);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java
index 866d89f50..abf032f48 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java
@@ -29,7 +29,7 @@ public void submissionInformationDisplayedOnSubmissionSelectionEvent() {
     String content = "Test Content";
     POASubmission submission = createPOASubmission(subject, submitter, submitTime, content);
 
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(view).setSubmissionSubject(subject);
     verify(view).setSubmissionSubmitter(submitter);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java
index 2e9ad1e2f..e0b67b7de 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java
@@ -1,5 +1,7 @@
 package edu.pdx.cs410J.grader.poa;
 
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+
 import java.time.LocalDateTime;
 
 public abstract class POASubmissionTestCase extends EventBusTestCase {
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java
index 3e0270a0a..c35d8ded8 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java
@@ -32,7 +32,7 @@ public void poaSubmissionDownloadedEventPopulatesPOASubmissionView() {
     LocalDateTime submitTime = LocalDateTime.now();
 
     POASubmission submission = createPOASubmission(subject, submitter, submitTime);
-    bus.post(submission);
+    publishEvent(submission);
 
     verify(view).setPOASubmissionsDescriptions(Arrays.asList(subject));
   }
@@ -44,8 +44,8 @@ public void submissionsDescriptionsAreDisplayedInOrderThatEventsWereSent() {
     String submitter = "Test Student";
     LocalDateTime submitTime = LocalDateTime.now();
 
-    bus.post(createPOASubmission(subject1, submitter, submitTime));
-    bus.post(createPOASubmission(subject2, submitter, submitTime));
+    publishEvent(createPOASubmission(subject1, submitter, submitTime));
+    publishEvent(createPOASubmission(subject2, submitter, submitTime));
 
     verify(view).setPOASubmissionsDescriptions(Arrays.asList(subject1));
     verify(view).setPOASubmissionsDescriptions(Arrays.asList(subject1, subject2));
@@ -65,9 +65,9 @@ public void selectingSubmissionFiresPOASubmissionSelectedEvent() {
     ArgumentCaptor<POASubmissionsView.POASubmissionSelectedListener> listener = ArgumentCaptor.forClass(POASubmissionsView.POASubmissionSelectedListener.class);
     verify(view).addSubmissionSelectedListener(listener.capture());
 
-    bus.post(createPOASubmission(subject1, submitter, submitTime));
+    publishEvent(createPOASubmission(subject1, submitter, submitTime));
     POASubmission submission = createPOASubmission(subject2, submitter, submitTime);
-    bus.post(submission);
+    publishEvent(submission);
 
     // When the user selects the second POA submission...
     listener.getValue().submissionSelected(1);
@@ -96,12 +96,12 @@ public void displayNextPOAEventDisplaysNextPOA() {
     verify(view).addSubmissionSelectedListener(listener.capture());
 
     POASubmission submission1 = createPOASubmission(subject1, submitter, submitTime);
-    bus.post(submission1);
+    publishEvent(submission1);
     POASubmission submission2 = createPOASubmission(subject2, submitter, submitTime);
-    bus.post(submission2);
+    publishEvent(submission2);
 
     // When a DisplayNextPOAEvent is posted
-    bus.post(new SelectNextPOAEvent());
+    publishEvent(new SelectNextPOAEvent());
 
     // Then the View is updated
     verify(view).selectPOASubmission(1);
@@ -129,10 +129,10 @@ public void displayingNextPOAAtEndOfSubmissionListDoesNothing() {
     verify(view).addSubmissionSelectedListener(listener.capture());
 
     POASubmission submission1 = createPOASubmission(subject1, submitter, submitTime);
-    bus.post(submission1);
+    publishEvent(submission1);
 
     // When a DisplayNextPOAEvent is posted
-    bus.post(new SelectNextPOAEvent());
+    publishEvent(new SelectNextPOAEvent());
 
     // Then nothing happens
     verify(view, times(0)).selectPOASubmission(anyInt());
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java
index 1a2ac99a8..e8b399e36 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java
@@ -42,7 +42,7 @@ public void setUp() {
 
   @Test
   public void viewIsPopulatedWhenGradeBookLoaded() {
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setStudents(Arrays.asList("<unknown student>", "First0 Last0 <email0@mail.com>", "First1 Last1 <email1@mail.com>", "First2 Last2 <email2@mail.com>"));
   }
@@ -54,14 +54,14 @@ public void studentsAreListedInAlphabeticalOrderByLastName() {
     book.addStudent(new Student("3").setFirstName("First3").setLastName("Last3").setEmail("email3@mail.com"));
     book.addStudent(new Student("1").setFirstName("First2").setLastName("Last2").setEmail("email2@mail.com"));
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setStudents(Arrays.asList("<unknown student>", "First1 Last1 <email1@mail.com>", "First2 Last2 <email2@mail.com>", "First3 Last3 <email3@mail.com>"));
   }
 
   @Test
   public void firstStudentIsSelectedWhenGradeBookLoaded() {
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setSelectedStudentIndex(0);
   }
@@ -74,7 +74,7 @@ public void selectingStudentInViewFiresStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().studentSelected(2);
 
@@ -99,7 +99,7 @@ public void selectingStudentInAlphabetizedViewFiresStudentSelectedEvent() {
     Student student2 = new Student("1").setFirstName("First2").setLastName("Last2").setEmail("email2@mail.com");
     book.addStudent(student2);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().studentSelected(2);
 
@@ -117,7 +117,7 @@ public void selectingUnknownStudentInViewFiresNullStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().studentSelected(0);
 
@@ -137,11 +137,11 @@ public void submissionWithMatchingStudentNameFiresStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(this.book));
+    publishEvent(new GradeBookLoaded(this.book));
 
     POASubmission submission =
       createPOASubmission("Subject", student1.getFirstName() + " " + student1.getLastName() + " <wrong@mail.com>", LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setSelectedStudentIndex(2);
 
@@ -156,11 +156,11 @@ public void submissionWithMatchingStudentEmailFiresStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(this.book));
+    publishEvent(new GradeBookLoaded(this.book));
 
     POASubmission submission =
       createPOASubmission("Subject", student2.getEmail(), LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setSelectedStudentIndex(3);
 
@@ -175,11 +175,11 @@ public void submissionByNonMatchingStudentFiresUnknownStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(this.book));
+    publishEvent(new GradeBookLoaded(this.book));
 
     POASubmission submission =
       createPOASubmission("Subject", "Unknown Student <unknown@mail.com>", LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view, times(2)).setSelectedStudentIndex(0);
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
new file mode 100644
index 000000000..1f66fb51d
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
@@ -0,0 +1,271 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+public class ProjectSubmissionOutputFileParserTest {
+
+  /*
+
+              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3
+              Submitted by David Whitlock
+              Submitted on 2017-Jul-28 19:51:41
+              Graded on Fri Jul 28 19:53:58 PDT 2017
+
+ out of 8.0
+
+   */
+
+  @Test
+  public void parseProjectName() {
+    OutputFile file = new OutputFile();
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getProjectName(), equalTo("Project3"));
+  }
+
+  @Test
+  public void parseStudentId() {
+    OutputFile file = new OutputFile();
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getStudentId(), equalTo("whitlock"));
+  }
+
+  @Test
+  public void parseStudentName() {
+    OutputFile file = new OutputFile();
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getStudentName(), equalTo("David Whitlock"));
+  }
+
+  @Test
+  public void parseSubmissionTime() throws ParseException {
+    OutputFile file = new OutputFile();
+    String submissionTimeString = "2017-Jul-28 19:51:41";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on " + submissionTimeString + "\n");
+
+    ProjectSubmission submission = parse(file);
+    Date submissionTime = ProjectSubmissionOutputFileParser.parseSubmissionTime(submissionTimeString);
+    assertThat(submission.getSubmissionTime(), equalTo(submissionTime));
+  }
+
+  @Test
+
+  public void parseGradingTime() throws ParseException {
+    OutputFile file = new OutputFile();
+    String gradingTimeString = "Fri Jul 28 19:53:58 PDT 2017";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on " + gradingTimeString + "\n");
+
+    ProjectSubmission submission = parse(file);
+    Date gradingTime = ProjectSubmissionOutputFileParser.parseGradingTime(gradingTimeString);
+    assertThat(submission.getGradedTime(), equalTo(gradingTime));
+  }
+
+
+  @Test
+  public void parseTotalPoints() {
+    OutputFile file = new OutputFile();
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line("");
+    file.line(" out of 8.0");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getTotalPoints(), equalTo(8.0));
+  }
+
+
+  @Test
+  public void parseEmptyGrade() {
+    OutputFile file = new OutputFile();
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line("");
+    file.line(" out of 8.0");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+
+  @Test
+  public void parseSpecifiedGrade() {
+    OutputFile file = new OutputFile();
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line("");
+    file.line("7.0 out of 8.0");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getScore(), equalTo(7.0));
+  }
+
+  @Ignore
+  @Test
+  public void parseCompilerTestCaseHasSameNameAndDescription() {
+    OutputFile file = new OutputFile();
+    String testNameAndDescription = "Compiling source code";
+    String command = "mvn --quiet --batch-mode --file airline-whitlock/pom.xml -DskipTests package";
+    String output = "This is the compiler output";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line();
+    file.line("7.0 out of 8.0");
+    file.line("*****  " + testNameAndDescription);
+    file.line();
+    file.line(command);
+    file.line();
+    file.line(output);
+
+    ProjectSubmission submission = parse(file);
+    List<TestCaseOutput> testCases = submission.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+
+    TestCaseOutput testCase = testCases.get(0);
+    assertThat(testCase.getName(), equalTo(testNameAndDescription));
+    assertThat(testCase.getDescription(), equalTo(testNameAndDescription));
+    assertThat(testCase.getCommand(), equalTo(command));
+    assertThat(testCase.getOutput(), equalTo(output));
+  }
+
+  @Ignore
+  @Test
+  public void parseCompilerTestWithNoOutput() {
+    OutputFile file = new OutputFile();
+    String testNameAndDescription = "Compiling source code";
+    String command = "mvn --quiet --batch-mode --file airline-whitlock/pom.xml -DskipTests package";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line();
+    file.line("7.0 out of 8.0");
+    file.line("*****  " + testNameAndDescription);
+    file.line();
+    file.line(command);
+    file.line();
+    file.line("*****  Test 1: No arguments");
+
+    ProjectSubmission submission = null;
+ 
+      submission = parse(file);
+  
+    List<TestCaseOutput> testCases = submission.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(2));
+
+    TestCaseOutput testCase = testCases.get(0);
+    assertThat(testCase.getName(), equalTo(testNameAndDescription));
+    assertThat(testCase.getDescription(), equalTo(testNameAndDescription));
+    assertThat(testCase.getCommand(), equalTo(command));
+    assertThat(testCase.getOutput(), equalTo(""));
+  }
+
+  @Ignore
+  @Test
+  public void parseTest1() throws IOException, ParseException {
+    OutputFile file = new OutputFile();
+    String testName = "Test 1";
+    String description = "No arguments";
+    String command = "$ java -Dstudent.name=np4 -Djava.security.manager -Djava.security.policy=file:/u/sjavata/submissions/summer2017/Project3/student-np4/java.policy -jar airline-np4/target/airline-np4-Summer2017.jar";
+    String output = "Please Check! Some of the arguments are missing.";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line();
+    file.line("7.0 out of 8.0");
+    file.line("*****  " + "Compiling source code");
+    file.line();
+    file.line("mvn --quiet --batch-mode --file airline-whitlock/pom.xml -DskipTests package");
+    file.line();
+    file.line("*****  " + testName + ": " + description);
+    file.line();
+    file.line(command);
+    file.line();
+    file.line(output);
+
+    ProjectSubmission submission = parse(file);
+    List<TestCaseOutput> testCases = submission.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(2));
+
+    TestCaseOutput testCase = testCases.get(1);
+    assertThat(testCase.getName(), equalTo(testName));
+    assertThat(testCase.getDescription(), equalTo(description));
+    assertThat(testCase.getCommand(), equalTo(command));
+    assertThat(testCase.getOutput(), equalTo(output));
+  }
+
+
+  private ProjectSubmission parse(OutputFile file) {
+    ProjectSubmission projectSubmission = null;
+    try {
+    String text = file.getText();
+    ProjectSubmissionOutputFileParser parser = new ProjectSubmissionOutputFileParser(new StringReader(text));
+    projectSubmission= parser.parse();
+   
+       parser.parse();
+    } catch (ParseException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    } catch (InvalidFileContentException e) {
+      e.printStackTrace();
+    }
+    return projectSubmission;
+  }
+
+  private class OutputFile {
+    private final StringWriter writer = new StringWriter();
+    private final PrintWriter pw = new PrintWriter(writer, true);
+
+    public void line(String line) {
+      pw.println(line);
+    }
+
+    public String getText() {
+      return this.writer.toString();
+    }
+
+    public void line() {
+      line("");
+    }
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
new file mode 100644
index 000000000..0c628f39d
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
@@ -0,0 +1,231 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView.ScoreChangedListener;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView.ScoreSavedListener;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.function.BiConsumer;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.mockito.Mockito.*;
+
+public class ProjectSubmissionScorePresenterTest extends ProjectSubmissionTestCase {
+
+  private ProjectSubmissionScoreView view;
+
+  @Override
+  public void setUp() {
+    super.setUp();
+    view = mock(ProjectSubmissionScoreView.class);
+    new ProjectSubmissionScorePresenter(bus, view);
+  }
+
+  @Test
+  public void viewIsPopulatedWhenSubmissionIsSelected() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(4.5);
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    verify(view).setTotalPoints("6.0");
+    verify(view).setScore("4.5");
+    verify(view).setScoreIsValid(true);
+  }
+
+  @Test
+  public void enteringValidScoreUpdatesSubmissionScore() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    listener.getValue().scoreChanged("5.0");
+
+    verify(view, times(2)).setScoreIsValid(true);
+    assertThat(submission.getScore(), equalTo(5.0));
+  }
+
+  @Test
+  public void enteringInvalidScorePutsPresenterInErrorState() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    listener.getValue().scoreChanged("qq");
+
+    verify(view).setScoreIsValid(false);
+
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Test
+  public void enteringEmptyScoreClearsScore() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    listener.getValue().scoreChanged("");
+
+    verify(view, times(2)).setScoreIsValid(true);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Test
+  public void negativeScoreIsInvalid() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+
+    listener.getValue().scoreChanged("-1.0");
+
+    verify(view).setScoreIsValid(false);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Test
+  public void scoreGreaterThanTotalIsInvalid() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+
+    listener.getValue().scoreChanged("7.0");
+
+    verify(view).setScoreIsValid(false);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Test
+  public void scoreInitiallyPopulatedWithTotalPoints() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    verify(view).setTotalPoints("6.0");
+    verify(view).setScore("6.0");
+    verify(view).setScoreIsValid(true);
+  }
+
+  @Test
+  public void savingScorePublishesProjectSubmissionScoreSaved() {
+    // When a score of 5.0 has been set for a project submission
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    double newScore = 5.2;
+    ScoreChangedListener scoreChanged =
+      captureListener(ScoreChangedListener.class, ProjectSubmissionScoreView::addScoreChangedListener);
+    scoreChanged.scoreChanged(String.valueOf(newScore));
+
+    ProjectSubmissionSavedHandler handler = mock(ProjectSubmissionSavedHandler.class);
+    bus.register(handler);
+
+    // When submission is saved...
+    ScoreSavedListener scoreSaved =
+      captureListener(ScoreSavedListener.class, ProjectSubmissionScoreView::addScoreSavedListener);
+    scoreSaved.submissionSaved();
+
+    // Then a ProjectSubmissionScoreSaved message is published
+    ArgumentCaptor<ProjectSubmissionScoreSaved> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionScoreSaved.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission().getScore(), equalTo(newScore));
+  }
+
+  @Test
+  public void testCaseScoreChangeUpdatesSubmissionScore() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(8.0);
+    TestCaseOutput testCase = new TestCaseOutput();
+    submission.addTestCaseOutput(testCase);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+    verify(view).setScore("8.0");
+
+    testCase.setPointsDeducted(3.0);
+    publishEvent(new TestCaseOutputUpdated(testCase));
+
+    verify(view, times(2)).setScoreIsValid(true);
+    verify(view).setScore("5.0");
+  }
+
+  @Test
+  public void testCaseScoreChangeUpdatesSubmissionScoreWhenATestCaseHasNoScore() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(8.0);
+    TestCaseOutput testCase = new TestCaseOutput();
+    submission.addTestCaseOutput(testCase);
+    submission.addTestCaseOutput(new TestCaseOutput());
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+    verify(view).setScore("8.0");
+
+    testCase.setPointsDeducted(3.0);
+    publishEvent(new TestCaseOutputUpdated(testCase));
+
+    verify(view, times(2)).setScoreIsValid(true);
+    verify(view).setScore("5.0");
+  }
+
+  @Test
+  public void savingSubmissionScoreWithNoDeductionsUpdatesToFullCredit() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(8.0);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+    verify(view).setScore("8.0");
+
+    ProjectSubmissionSavedHandler handler = mock(ProjectSubmissionSavedHandler.class);
+    bus.register(handler);
+
+    // When submission is saved...
+    ScoreSavedListener scoreSaved =
+      captureListener(ScoreSavedListener.class, ProjectSubmissionScoreView::addScoreSavedListener);
+    scoreSaved.submissionSaved();
+
+    // Then a ProjectSubmissionScoreSaved with the full credit score
+    ArgumentCaptor<ProjectSubmissionScoreSaved> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionScoreSaved.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission().getScore(), equalTo(submission.getTotalPoints()));
+  }
+
+
+  private interface ProjectSubmissionSavedHandler {
+    @Subscribe
+    void handle(ProjectSubmissionScoreSaved event);
+  }
+
+  private <L> L captureListener(Class<L> listenerClass, BiConsumer<ProjectSubmissionScoreView, L> addListener) {
+    ArgumentCaptor<L> listener = ArgumentCaptor.forClass(listenerClass);
+    addListener.accept(verify(view), listener.capture());
+    return listener.getValue();
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionTestCase.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionTestCase.java
new file mode 100644
index 000000000..7ee5fe38b
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionTestCase.java
@@ -0,0 +1,12 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+
+public class ProjectSubmissionTestCase extends EventBusTestCase {
+  protected ProjectSubmission createProjectSubmission(String projectName, String studentId) {
+    ProjectSubmission submission = new ProjectSubmission();
+    submission.setProjectName(projectName);
+    submission.setStudentId(studentId);
+    return submission;
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
new file mode 100644
index 000000000..b579f3c5b
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
@@ -0,0 +1,242 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import org.junit.Test;
+
+import javax.xml.bind.JAXBException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+public class ProjectSubmissionXmlConverterTest {
+
+  @Test
+  public void convertProjectName() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    String projectName = "Project";
+    expected.setProjectName(projectName);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getProjectName(), equalTo(projectName));
+  }
+
+  private ProjectSubmission convertToXmlAndBack(ProjectSubmission submission) throws JAXBException {
+    ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
+    StringWriter sw = new StringWriter();
+    converter.convertToXml(submission, sw);
+    String xml = sw.toString();
+    System.out.println(xml);
+    return converter.convertFromXml(new StringReader(xml));
+  }
+
+  @Test
+  public void convertStudentId() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    String studentId = "studentId";
+    expected.setStudentId(studentId);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getStudentId(), equalTo(studentId));
+  }
+
+  @Test
+  public void convertStudentName() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    String studentName = "studentName";
+    expected.setStudentName(studentName);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getStudentName(), equalTo(studentName));
+  }
+
+  @Test
+  public void convertTotalPoints() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    double totalPoints = 7.0;
+    expected.setTotalPoints(totalPoints);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getTotalPoints(), equalTo(totalPoints));
+  }
+
+  @Test
+  public void convertNullScore() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    Double score = null;
+    expected.setScore(score);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getScore(), equalTo(score));
+  }
+
+  @Test
+  public void convertNonNullScore() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    Double score = 3.4;
+    expected.setScore(score);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getScore(), equalTo(score));
+  }
+
+  @Test
+  public void convertNonSubmissionTime() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    Date submissionTime = new Date();
+    expected.setSubmissionTime(submissionTime);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getSubmissionTime(), equalTo(submissionTime));
+  }
+
+  @Test
+  public void convertEmptyTestCaseOutput() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+  }
+
+  @Test
+  public void convertTestCaseOutputPointsDeducted() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    double pointsDeducted = 3.4;
+    testCase.setPointsDeducted(pointsDeducted);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getPointsDeducted(), equalTo(pointsDeducted));
+  }
+
+  @Test
+  public void convertTestCaseOutputGraderComment() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String graderComment = "This is a comment";
+    testCase.setGraderComment(graderComment);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getGraderComment(), equalTo(graderComment));
+  }
+
+  @Test
+  public void convertTestCaseOutputDescription() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String description = "This is a description";
+    testCase.setDescription(description);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getDescription(), equalTo(description));
+  }
+
+  @Test
+  public void convertTestCaseCommand() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String command = "This is a command";
+    testCase.setCommand(command);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getCommand(), equalTo(command));
+  }
+
+  @Test
+  public void convertTestCaseName() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String name = "This is the name";
+    testCase.setName(name);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getName(), equalTo(name));
+  }
+
+  @Test
+  public void convertTestCaseOutput() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String output = "This is output";
+    testCase.setOutput(output);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getOutput(), equalTo(output));
+  }
+
+  @Test
+  public void convertMultipleTestCaseOutputs() throws JAXBException {
+    String name1 = "Name1";
+    String command1 = "Command1";
+    Double pointsDeducted1 = 1.0;
+    String comment1 = "Comment1";
+    String output1 = "This is output1";
+    String description1 = "Description1";
+
+    String name2 = "Name2";
+    String command2 = "Command2";
+    Double pointsDeducted2 = 2.0;
+    String comment2 = "Comment2";
+    String output2 = "This is output2";
+    String description2 = "Description2";
+
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase1 = new TestCaseOutput()
+      .setName(name1)
+      .setDescription(description1)
+      .setCommand(command1)
+      .setOutput(output1)
+      .setPointsDeducted(pointsDeducted1)
+      .setGraderComment(comment1);
+    expected.addTestCaseOutput(testCase1);
+
+    TestCaseOutput testCase2 = new TestCaseOutput()
+      .setName(name2)
+      .setDescription(description2)
+      .setCommand(command2)
+      .setOutput(output2)
+      .setPointsDeducted(pointsDeducted2)
+      .setGraderComment(comment2);
+    expected.addTestCaseOutput(testCase2);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(2));
+    assertThat(testCases.get(0).getName(), equalTo(name1));
+    assertThat(testCases.get(0).getDescription(), equalTo(description1));
+    assertThat(testCases.get(0).getCommand(), equalTo(command1));
+    assertThat(testCases.get(0).getOutput(), equalTo(output1));
+    assertThat(testCases.get(0).getPointsDeducted(), equalTo(pointsDeducted1));
+    assertThat(testCases.get(0).getGraderComment(), equalTo(comment1));
+    assertThat(testCases.get(1).getName(), equalTo(name2));
+    assertThat(testCases.get(1).getDescription(), equalTo(description2));
+    assertThat(testCases.get(1).getCommand(), equalTo(command2));
+    assertThat(testCases.get(1).getOutput(), equalTo(output2));
+    assertThat(testCases.get(1).getPointsDeducted(), equalTo(pointsDeducted2));
+    assertThat(testCases.get(1).getGraderComment(), equalTo(comment2));
+  }
+
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
new file mode 100644
index 000000000..89d754812
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
@@ -0,0 +1,106 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverPresenter.ProjectSubmissionXmlLoader;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverPresenter.ProjectSubmissionXmlWriter;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView.DirectorySelectedListener;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView.SaveSubmissionsListener;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import javax.xml.bind.JAXBException;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.notNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class ProjectSubmissionsLoaderSaverPresenterTest extends ProjectSubmissionTestCase {
+
+  private final ProjectSubmissionsLoaderSaverView view = mock(ProjectSubmissionsLoaderSaverView.class);
+  private final File testDirectory = new File(System.getProperty("user.dir"));
+  private ProjectSubmissionXmlWriter xmlWriter = mock(ProjectSubmissionXmlWriter.class);
+  private Map<File, String> submissionsXml;
+
+  @Override
+  public void setUp() {
+    super.setUp();
+
+    try {
+      ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
+      submissionsXml = new LinkedHashMap<>();
+      submissionsXml.put(new File(testDirectory, "one.xml"), converter.getXmlString(createProjectSubmission("Project", "one")));
+      submissionsXml.put(new File(testDirectory, "two.xml"), converter.getXmlString(createProjectSubmission("Project", "two")));
+
+      new ProjectSubmissionsLoaderSaverPresenter(bus, view, new ProjectSubmissionXmlLoader() {
+        @Override
+        public Reader getReader(File file) throws FileNotFoundException {
+          return new StringReader(submissionsXml.get(file));
+        }
+
+        @Override
+        public List<File> getSubmissionFiles(File directory) {
+          return new ArrayList<>(submissionsXml.keySet());
+        }
+      }, xmlWriter);
+
+    } catch (JAXBException e) {
+      fail(e.toString());
+    }
+  }
+
+  @Test
+  public void submissionsLoadedWhenDirectorySelected() {
+    ArgumentCaptor<DirectorySelectedListener> listener = ArgumentCaptor.forClass(DirectorySelectedListener.class);
+    verify(view).addDirectorySelectedListener(listener.capture());
+
+    ProjectSubmissionsLoadedHandler handler = mock(ProjectSubmissionsLoadedHandler.class);
+    bus.register(handler);
+
+    listener.getValue().directorySelected(testDirectory);
+
+    ArgumentCaptor<ProjectSubmissionsLoaded> event = ArgumentCaptor.forClass(ProjectSubmissionsLoaded.class);
+    verify(handler).handle(event.capture());
+
+    List<LoadedProjectSubmission> submissions = event.getValue().getLoadedSubmissions();
+    assertThat(submissions.size(), equalTo(2));
+    for (LoadedProjectSubmission submission : submissions) {
+      assertThat(submission.getFile().getName(), equalTo(submission.getSubmission().getStudentId() + ".xml"));
+    }
+
+    String message = ProjectSubmissionsLoaderSaverPresenter.loadedSubmissionsFrom(testDirectory);
+    verify(view).setDisplayMessage(message);
+  }
+
+  @Test
+  public void submissionsSavedWhenSaveButtonClicked() throws IOException {
+    ArgumentCaptor<DirectorySelectedListener> directorySelected = ArgumentCaptor.forClass(DirectorySelectedListener.class);
+    verify(view).addDirectorySelectedListener(directorySelected.capture());
+    directorySelected.getValue().directorySelected(testDirectory);
+
+    ArgumentCaptor<SaveSubmissionsListener> listener = ArgumentCaptor.forClass(SaveSubmissionsListener.class);
+    verify(view).addSaveSubmissionsListener(listener.capture());
+    listener.getValue().onSaveSubmissions();
+
+    verify(xmlWriter, times(2)).writeXmlToFile(notNull(File.class), notNull(String.class));
+  }
+
+  @Test
+  public void clickHereMessageIsInitiallyDisplayed() {
+    verify(view).setDisplayMessage(ProjectSubmissionsLoaderSaverPresenter.CLICK_HERE_MESSAGE);
+  }
+
+  interface ProjectSubmissionsLoadedHandler {
+    @Subscribe
+    void handle(ProjectSubmissionsLoaded event);
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
new file mode 100644
index 000000000..6dd907a9d
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -0,0 +1,202 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView.SubmissionNameSelectedListener;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.mockito.Mockito.*;
+
+public class ProjectSubmissionsPresenterTest extends ProjectSubmissionTestCase {
+
+  private ProjectSubmissionsView view;
+
+  @Override
+  @Before
+  public void setUp() {
+    super.setUp();
+    view = mock(ProjectSubmissionsView.class);
+    new ProjectSubmissionsPresenter(this.bus, view);
+  }
+
+  @Test
+  public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
+    String projectName = "Project";
+    String studentId = "student";
+
+    ProjectSubmission submission = createProjectSubmission(projectName, studentId);
+
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(Collections.singletonList(submission)));
+    publishEvent(loaded);
+
+    String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
+    verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(submissionName));
+  }
+
+  private List<LoadedProjectSubmission> newLoadedSubmission(Iterable<ProjectSubmission> submissions) {
+    List<LoadedProjectSubmission> list = new ArrayList<>();
+    for (ProjectSubmission submission : submissions) {
+      list.add(newLoadedSubmission(submission));
+    }
+    return list;
+  }
+
+  private LoadedProjectSubmission newLoadedSubmission(ProjectSubmission submission) {
+    String studentId = submission.getStudentId();
+    File file = new File(new File(System.getProperty("user.dir")), studentId + ".xml");
+    return new LoadedProjectSubmission(file, submission);
+  }
+
+  @Test
+  public void viewIsPopulatedWithGradedAndUngradedSubmissions() {
+    String projectName = "Project";
+    String ungradedStudentName = "student0";
+    ProjectSubmission ungraded = createProjectSubmission(projectName, ungradedStudentName);
+    ungraded.setScore(null);
+
+    String gradedStudentName = "student1";
+    ProjectSubmission graded = createProjectSubmission(projectName, gradedStudentName);
+    graded.setScore(4.0);
+
+    publishEvent(new ProjectSubmissionsLoaded(newLoadedSubmission(Arrays.asList(ungraded, graded))));
+
+    String ungradedName = ProjectSubmissionsPresenter.getProjectSubmissionName(ungradedStudentName, projectName);
+    verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(ungradedName));
+    verify(view).setSelectedUngradedSubmission(0);
+
+    String gradedName = ProjectSubmissionsPresenter.getProjectSubmissionName(gradedStudentName, projectName);
+    verify(view).setGradedProjectSubmissionNames(Collections.singletonList(gradedName));
+  }
+
+  @Test
+  public void eventIsPublishedWhenUngradedProjectSubmissionIsSelected() {
+    ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
+    verify(view).addUngradedSubmissionNameSelectedListener(listener.capture());
+
+    String projectName = "Project";
+    String studentId = "student1";
+
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    submissions.add(createProjectSubmission(projectName, "student0"));
+    ProjectSubmission submission1 = createProjectSubmission(projectName, studentId);
+    submissions.add(submission1);
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(submissions));
+    publishEvent(loaded);
+
+    // When the user selects the second project submission...
+    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
+    bus.register(handler);
+    listener.getValue().submissionNameSelected(1);
+
+    // Then a ProjectSubmissionSelected event for that submission is published
+
+    ArgumentCaptor<ProjectSubmissionSelected> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission(), equalTo(submission1));
+
+    verifyNoMoreInteractions(handler);
+  }
+
+  @Test
+  public void eventIsPublishedWhenGradedProjectSubmissionIsSelected() {
+    ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
+    verify(view).addGradedSubmissionNameSelectedListener(listener.capture());
+
+    String projectName = "Project";
+    String studentId = "student1";
+
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    submissions.add(createProjectSubmission(projectName, "student0").setScore(3.0));
+    ProjectSubmission submission1 = createProjectSubmission(projectName, studentId);
+    submission1.setScore(4.0);
+    submissions.add(submission1);
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(submissions));
+    publishEvent(loaded);
+
+    // When the user selects the second project submission...
+    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
+    bus.register(handler);
+    listener.getValue().submissionNameSelected(1);
+
+    // Then a ProjectSubmissionSelected event for that submission is published
+
+    ArgumentCaptor<ProjectSubmissionSelected> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission(), equalTo(submission1));
+
+    verifyNoMoreInteractions(handler);
+  }
+
+  @Test
+  public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
+    ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
+    verify(view).addUngradedSubmissionNameSelectedListener(listener.capture());
+
+    String projectName = "Project";
+
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    ProjectSubmission submission0 = createProjectSubmission(projectName, "student0");
+    submissions.add(submission0);
+    submissions.add(createProjectSubmission(projectName, "student1"));
+
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(submissions));
+    publishEvent(loaded);
+    verify(view).setSelectedUngradedSubmission(0);
+  }
+
+  @Test
+  public void submissionMovedToGradedWhenUpdated() {
+    String projectName = "Project";
+    String studentId = "student";
+    ProjectSubmission submission = createProjectSubmission(projectName, studentId);
+    submission.setScore(null);
+
+    publishEvent(new ProjectSubmissionsLoaded(newLoadedSubmission(Collections.singletonList(submission))));
+
+    String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
+    verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(submissionName));
+    verify(view).setSelectedUngradedSubmission(0);
+
+    submission.setScore(3.0);
+    publishEvent(new ProjectSubmissionScoreSaved(submission));
+
+    verify(view).setGradedProjectSubmissionNames(Collections.singletonList(submissionName));
+  }
+
+  @Test
+  public void nextSubmissionSelectedWhenSubmissionGraded() {
+    ProjectSubmission submission0 = createProjectSubmission("Project", "student0");
+    submission0.setScore(null);
+    ProjectSubmission submission1 = createProjectSubmission("Project", "student1");
+    submission1.setScore(null);
+
+    publishEvent(new ProjectSubmissionsLoaded(newLoadedSubmission(Arrays.asList(submission0, submission1))));
+
+    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
+    this.bus.register(handler);
+
+    submission0.setScore(3.0);
+    publishEvent(new ProjectSubmissionScoreSaved(submission0));
+
+    ArgumentCaptor<ProjectSubmissionSelected> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+
+    assertThat(eventCaptor.getValue().getProjectSubmission(), equalTo(submission1));
+
+  }
+
+  private interface ProjectSubmissionSelectedHandler {
+    @Subscribe
+    void handle(ProjectSubmissionSelected event);
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
new file mode 100644
index 000000000..656804a84
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
@@ -0,0 +1,122 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.TestCaseOutputView.GraderCommentChangeListener;
+import edu.pdx.cs410J.grader.scoring.TestCaseOutputView.PointsDeductedChangeListener;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+public class TestCaseOutputPresenterTest extends ProjectSubmissionTestCase {
+
+  private TestCaseOutputView view;
+
+  @Override
+  public void setUp() {
+    super.setUp();
+    view = mock(TestCaseOutputView.class);
+    new TestCaseOutputPresenter(bus, view);
+  }
+
+  @Test
+  public void testCaseOutputDetailsAreViewedWhenTestCaseSelected() {
+    String description = "My Test Case";
+    String command = "My Command";
+    String output = "My Output";
+    String comment = "My Grader Comment";
+    TestCaseOutput testCase = new TestCaseOutput()
+      .setDescription(description)
+      .setCommand(command)
+      .setOutput(output)
+      .setPointsDeducted(null)
+      .setGraderComment(comment);
+
+    publishEvent(new TestCaseSelected(testCase));
+
+    verify(view).setDescription(description);
+    verify(view).setCommand(command);
+    verify(view).setOutput(output);
+    verify(view).setPointsDeducted("");
+    verify(view).setGraderComment(comment);
+  }
+
+  @Test
+  public void pointsDeductedAreDisplayedInView() {
+    TestCaseOutput testCase = new TestCaseOutput()
+      .setPointsDeducted(0.5);
+
+    publishEvent(new TestCaseSelected(testCase));
+
+    verify(view).setPointsDeductedIsValid(true);
+    verify(view).setPointsDeducted("0.5");
+  }
+
+  @Test
+  public void invalidPointsDeductedPutViewInErrorState() {
+    ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
+    verify(view).addPointsDeductedChangeListener(listener.capture());
+
+    publishEvent(new TestCaseSelected(new TestCaseOutput()));
+
+    String invalidPoints = "QQ";
+    listener.getValue().onPointsDeductedChange(invalidPoints);
+
+    verify(view).setPointsDeductedIsValid(false);
+  }
+
+  @Test
+  public void negativePointsDeductedPutViewInErrorState() {
+    ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
+    verify(view).addPointsDeductedChangeListener(listener.capture());
+
+    publishEvent(new TestCaseSelected(new TestCaseOutput()));
+
+    String invalidPoints = "-1.0";
+    listener.getValue().onPointsDeductedChange(invalidPoints);
+
+    verify(view).setPointsDeductedIsValid(false);
+  }
+
+  @Test
+  public void graderCommentIsSavedInTestCaseOutput() {
+    ArgumentCaptor<GraderCommentChangeListener> listener = ArgumentCaptor.forClass(GraderCommentChangeListener.class);
+    verify(view).addGraderCommentChangeListener(listener.capture());
+
+    TestCaseOutput testCase = new TestCaseOutput();
+
+    publishEvent(new TestCaseSelected(testCase));
+
+    String comment = "My new comment";
+    listener.getValue().onGraderCommentChange(comment);
+
+    assertThat(testCase.getGraderComment(), equalTo(comment));
+  }
+
+  @Test
+  public void deductingPublishesTestCaseOutputUpdatedEvent() {
+    ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
+    verify(view).addPointsDeductedChangeListener(listener.capture());
+
+    publishEvent(new TestCaseSelected(new TestCaseOutput()));
+
+    TestCaseOutputUpdatedHandler handler = mock(TestCaseOutputUpdatedHandler.class);
+    bus.register(handler);
+    listener.getValue().onPointsDeductedChange("2.0");
+
+    ArgumentCaptor<TestCaseOutputUpdated> eventCaptor = ArgumentCaptor.forClass(TestCaseOutputUpdated.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getTestCaseOutput().getPointsDeducted(), equalTo(2.0));
+
+    verifyNoMoreInteractions(handler);
+  }
+
+  interface TestCaseOutputUpdatedHandler {
+    @Subscribe
+    void handle(TestCaseOutputUpdated event);
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
new file mode 100644
index 000000000..a4364eec0
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -0,0 +1,142 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.TestCasesView.TestCaseNameSelectedListener;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.mockito.Mockito.*;
+
+public class TestCasesPresenterTest extends ProjectSubmissionTestCase {
+
+  private TestCasesView view;
+
+  @Override
+  public void setUp() {
+    super.setUp();
+    view = mock(TestCasesView.class);
+    new TestCasesPresenter(bus, view);
+  }
+
+  @Test
+  public void selectingSubmissionPopulatesTestCases() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    String testCaseName = "test";
+    submission.addTestCaseOutput(new TestCaseOutput().setName(testCaseName));
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    verify(view).setTestCaseNames(Collections.singletonList(testCaseName));
+  }
+
+  @Test
+  public void selectingTestCasePublishesEvent() {
+    ArgumentCaptor<TestCaseNameSelectedListener> listener = ArgumentCaptor.forClass(TestCaseNameSelectedListener.class);
+    verify(view).addTestCaseNameSelectedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.addTestCaseOutput(new TestCaseOutput().setName("test0"));
+    TestCaseOutput testCase1 = new TestCaseOutput().setName("test1");
+    submission.addTestCaseOutput(testCase1);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    // When the user selects the second test case...
+    TestCaseOutputSelectedHandler handler = mock(TestCaseOutputSelectedHandler.class);
+    bus.register(handler);
+    listener.getValue().testCaseNameSelected(1);
+
+    // Then a TestCaseSelected event for that test case is published
+    ArgumentCaptor<TestCaseSelected> eventCaptor = ArgumentCaptor.forClass(TestCaseSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getTestCaseOutput(), equalTo(testCase1));
+
+    verifyNoMoreInteractions(handler);
+  }
+
+  @Test
+  public void firstTestCaseIsSelectedWhenSubmissionIsSelected() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.addTestCaseOutput(new TestCaseOutput().setName("test1"));
+    submission.addTestCaseOutput(new TestCaseOutput().setName("test2"));
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    verify(view).setSelectedTestCaseName(0);
+
+  }
+
+  @Test
+  public void pointsDeductedIsDisplayedInView() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    String testCaseName = "Test 1";
+    double pointsDeducted = 0.5;
+    TestCaseOutput testCase = new TestCaseOutput()
+      .setName(testCaseName)
+      .setPointsDeducted(pointsDeducted);
+    submission.addTestCaseOutput(testCase);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+
+    String expected = TestCasesPresenter.formatTestCase(testCaseName, pointsDeducted);
+    verify(view).setTestCaseNames(Collections.singletonList(expected));
+  }
+
+  @Test
+  public void viewIsUpdatedWhenPointsAreDeducted() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+
+    String testName0 = "Test 0";
+    submission.addTestCaseOutput(new TestCaseOutput().setName(testName0));
+    String testName1 = "Test 1";
+    TestCaseOutput testCase1 = new TestCaseOutput().setName(testName1);
+    assertThat(testCase1.getPointsDeducted(), equalTo(null));
+    submission.addTestCaseOutput(testCase1);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setTestCaseNames(Arrays.asList(testName0, testName1));
+    verify(view).setSelectedTestCaseName(0);
+
+    double pointsDeducted = 0.5;
+    testCase1.setPointsDeducted(pointsDeducted);
+    publishEvent(new TestCaseOutputUpdated(testCase1));
+
+    String expected = TestCasesPresenter.formatTestCase(testName1, pointsDeducted);
+    verify(view).setTestCaseNames(Arrays.asList(testName0, expected));
+    verify(view, never()).setSelectedTestCaseName(1);
+  }
+
+  @Test
+  public void nextTestCaseIsSelectedWhenTestCaseIsUpdated() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+
+    TestCaseOutput testCase0 = new TestCaseOutput().setName("Test 0");
+    submission.addTestCaseOutput(testCase0);
+    TestCaseOutput testCase1 = new TestCaseOutput().setName("Test 1");
+    assertThat(testCase1.getPointsDeducted(), equalTo(null));
+    submission.addTestCaseOutput(testCase1);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setSelectedTestCaseName(0);
+
+    TestCaseOutputSelectedHandler handler = mock(TestCaseOutputSelectedHandler.class);
+    this.bus.register(handler);
+
+    publishEvent(new TestCaseOutputUpdated(testCase0));
+    verify(view).setSelectedTestCaseName(1);
+
+    ArgumentCaptor<TestCaseSelected> eventCaptor = ArgumentCaptor.forClass(TestCaseSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getTestCaseOutput(), equalTo(testCase1));
+  }
+
+  private interface TestCaseOutputSelectedHandler {
+    @Subscribe
+    public void handle(TestCaseSelected event);
+  }
+}