diff --git a/action.php b/action.php
index 5f17d70..f3920b4 100644
--- a/action.php
+++ b/action.php
@@ -72,7 +72,7 @@
                     $message = $message.$oppplayer->linkTo().'.';
                 }
                 if ($match->player_reportable_check() == true) {
-                    $message = $message.'  <a href="player.php?mode=submit_result&match_id='.$match->id.'&player='.$player_number.'">(Report Result)</a>';
+                    $message = $message.'  <a href="report.php?mode=submit_result&match_id='.$match->id.'&player='.$player_number.'">(Report Result)</a>';
                 }
             }
         } elseif ($match->result != 'BYE' && $match->verification == 'failed') {
@@ -86,7 +86,7 @@
 
             if ($match->player_reportable_check() == true) {
                 $message = "The reported result wasn't consistent with your opponent's, please resubmit $event->name vs. ".$oppplayer->linkTo().'.';
-                $message = $message.'<a href="player.php?mode=submit_result&match_id='.$match->id.'&player='.$player_number.'">(Report Result)</a>';
+                $message = $message.'<a href="report.php?mode=submit_result&match_id='.$match->id.'&player='.$player_number.'">(Report Result)</a>';
             } else {
                 $message = "You have an unreported match in $match->eventname.";
             }
diff --git a/admin/infobot.php b/admin/infobot.php
index 5a1fc1c..7d50f8f 100644
--- a/admin/infobot.php
+++ b/admin/infobot.php
@@ -28,5 +28,5 @@
     $player->setPassword($challenge);
     echo "<UaReply>Your temporary password for {$CONFIG['site_name']} is $challenge</UaReply>";
 } else {
-    echo '<error>Unknown Action</error>';
+    echo "<error>Unknown Action: {$_REQUEST['mode']}</error>";
 }
diff --git a/event.php b/event.php
index e9581da..30a1957 100644
--- a/event.php
+++ b/event.php
@@ -1134,7 +1134,7 @@ function kValueDropMenu($kvalue)
         $kvalue = -1;
     }
     $names = [''      => '- K-Value -', 8 => 'Casual (Alt Event)', 16 => 'Regular (less than 24 players)',
-                 24   => 'Large (24 or more players)', 32 => 'Championship', ];
+        24            => 'Large (24 or more players)', 32 => 'Championship', ];
     print_select_input('K-Value', 'kvalue', $names, $kvalue);
 }
 
@@ -1144,7 +1144,7 @@ function monthDropMenu($month)
         $month = -1;
     }
     $names = ['January', 'February', 'March', 'April', 'May', 'June',
-    'July', 'August', 'September', 'October', 'November', 'December', ];
+        'July', 'August', 'September', 'October', 'November', 'December', ];
     echo '<select class="inputbox" name="month">';
     echo '<option value="">- Month -</option>';
     for ($m = 1; $m <= 12; $m++) {
diff --git a/eventreport.php b/eventreport.php
index 97f914b..4de70dd 100644
--- a/eventreport.php
+++ b/eventreport.php
@@ -229,8 +229,8 @@ function fullmetagame($event)
     $players = [];
     foreach ($decks as $deck) {
         $info = ['player'          => $deck->playername, 'deckname' => $deck->name,
-                  'archetype'      => $deck->archetype, 'medal' => $deck->medal,
-                              'id' => $deck->id, ];
+            'archetype'            => $deck->archetype, 'medal' => $deck->medal,
+            'id'                   => $deck->id, ];
         $arr = deckInfo($deck);
         $info['colors'] = $arr[1];
         if ($info['medal'] == 'dot') {
diff --git a/index.php b/index.php
index 0336f21..c24a631 100644
--- a/index.php
+++ b/index.php
@@ -66,7 +66,7 @@
     <div id="" class="grid_4">
         <div class="box pad">
             <?php $player = Player::getSessionPlayer(); ?>
-            <?php if ($player != null): ?>
+            <?php if ($player != null) { ?>
                 <div>
                     <b> Welcome back <?php echo $player->name ?> </b>
                     <ul>
@@ -90,7 +90,7 @@
     } ?>
                     </ul>
                 </div>
-            <?php else: ?>
+            <?php } else { ?>
                 <div style="height: 165px;">
                     <b>Login to Gatherling</b>
                     <table class="form" align="left" cellpadding="3">
@@ -113,7 +113,7 @@
                         </form>
                     </table>
                 </div>
-            <?php endif; ?>
+            <?php } ?>
         </div><!-- grid_4 omega (login/links) -->
         <?php include 'sidebar.php'; ?>
     </div> <!-- Sidebar -->
diff --git a/lib.php b/lib.php
index 7e8cfdb..9c1f60e 100644
--- a/lib.php
+++ b/lib.php
@@ -509,12 +509,13 @@ function print_warning_if($conditional)
 
 function version_number()
 {
-    return '4.8.3';
+    return '4.8.8';
 }
 
 function version_tagline()
 {
-    echo 'Gatherling version 4.8.7 ("Step 7: Steal a bagel.")';
+    echo 'Gatherling version 4.8.8 ("Fish fingers and custard")';
+    // echo 'Gatherling version 4.8.7 ("Step 7: Steal a bagel.")';
     // echo 'Gatherling version 4.8.6.1 ("I\'m gonna steal the declaration of independence.")';
     // echo 'Gatherling version 4.8.6 ("I\'m gonna steal the declaration of independence.")';
     // echo 'Gatherling version 4.8.5 ("That\'s my secret, Captain: I\'m always angry...")';
diff --git a/models/Event.php b/models/Event.php
index e2e4090..868ec7c 100644
--- a/models/Event.php
+++ b/models/Event.php
@@ -333,8 +333,8 @@ public function getFinalists()
         $finalists = [];
         while ($stmt->fetch()) {
             $finalists[] = ['medal'       => $medal,
-                           'player'       => $player,
-                           'deck'         => $deck, ];
+                'player'                  => $player,
+                'deck'                    => $deck, ];
         }
         $stmt->close();
 
diff --git a/models/Player.php b/models/Player.php
index c7bf3d9..827673f 100644
--- a/models/Player.php
+++ b/models/Player.php
@@ -995,13 +995,13 @@ public function getBestDeckStats()
         $res = [];
         while ($stmt->fetch()) {
             $res[] = ['name'      => $name,
-                     'cnt'        => $cnt,
-                     'id'         => $id,
-                     't8'         => $t8,
-                     't4'         => $t4,
-                     '2nd'        => $secnd,
-                     '1st'        => $first,
-                     'score'      => $score, ];
+                'cnt'             => $cnt,
+                'id'              => $id,
+                't8'              => $t8,
+                't4'              => $t4,
+                '2nd'             => $secnd,
+                '1st'             => $first,
+                'score'           => $score, ];
         }
         $stmt->close();
 
diff --git a/models/Ratings.php b/models/Ratings.php
index d5d387a..6f69218 100644
--- a/models/Ratings.php
+++ b/models/Ratings.php
@@ -21,8 +21,8 @@ public function __construct($format = '')
             $this->wins = 0;
             $this->losses = 0;
             $this->ratingNames = ['Standard', 'Extended', 'Modern', 'Classic', 'Legacy',
-                                       'Pauper', 'SilverBlack', 'Heirloom', 'Commander', 'Tribal Wars',
-                                       'Penny Dreadful', ];
+                'Pauper', 'SilverBlack', 'Heirloom', 'Commander', 'Tribal Wars',
+                'Penny Dreadful', ];
 
             return;
         }
@@ -31,8 +31,8 @@ public function __construct($format = '')
     public function formatDropMenuR($format = '')
     {
         $names = ['Composite', 'Standard', 'Extended', 'Modern',
-                       'Classic', 'Legacy', 'Pauper', 'SilverBlack', 'Heirloom',
-                       'Commander', 'Tribal Wars', 'Other Formats', ];
+            'Classic', 'Legacy', 'Pauper', 'SilverBlack', 'Heirloom',
+            'Commander', 'Tribal Wars', 'Other Formats', ];
         echo '<select class="inputbox" name="format">';
         foreach ($names as $name) {
             $sel = (strcmp($name, $format) == 0) ? 'selected' : '';
@@ -244,9 +244,9 @@ public function getMatches($event)
         $data = [];
         while ($stmt->fetch()) {
             $data[] = ['playera'      => $playera,
-                            'playerb' => $playerb,
-                            'result'  => $result,
-                            'kvalue'  => $kvalue, ];
+                'playerb'             => $playerb,
+                'result'              => $result,
+                'kvalue'              => $kvalue, ];
         }
         $stmt->close();
 
diff --git a/models/Series.php b/models/Series.php
index 98ea2ca..030c765 100644
--- a/models/Series.php
+++ b/models/Series.php
@@ -341,20 +341,20 @@ public function currentSeason()
     // TODO: THESE functions are UGLY.
     public function getSeasonRules($season_number)
     {
-        $season_rules = ['first_pts' => 0,
-      'second_pts'                   => 0,
-      'semi_pts'                     => 0,
-      'quarter_pts'                  => 0,
-      'participation_pts'            => 0,
-      'rounds_pts'                   => 0,
-      'decklist_pts'                 => 0,
-      'win_pts'                      => 0,
-      'loss_pts'                     => 0,
-      'bye_pts'                      => 0,
-      'must_decklist'                => 0,
-      'cutoff_ord'                   => 0,
-      'master_link'                  => '',
-      'format'                       => '', ];
+        $season_rules = ['first_pts'       => 0,
+            'second_pts'                   => 0,
+            'semi_pts'                     => 0,
+            'quarter_pts'                  => 0,
+            'participation_pts'            => 0,
+            'rounds_pts'                   => 0,
+            'decklist_pts'                 => 0,
+            'win_pts'                      => 0,
+            'loss_pts'                     => 0,
+            'bye_pts'                      => 0,
+            'must_decklist'                => 0,
+            'cutoff_ord'                   => 0,
+            'master_link'                  => '',
+            'format'                       => '', ];
 
         $db = Database::getConnection();
         $stmt = $db->prepare('SELECT series, first_pts, second_pts, semi_pts, quarter_pts, participation_pts,
diff --git a/player.php b/player.php
index ba5d909..c804987 100644
--- a/player.php
+++ b/player.php
@@ -65,41 +65,6 @@
             } else {
                 $result = "Your challenge is wrong.  Get a new one by sending the message '<code>!verify {$CONFIG['infobot_prefix']}</code>' to pdbot on MTGO!";
             }
-        } elseif ($_POST['action'] == 'finalize_result') {
-            // write results to matches table
-            $drop = false;
-            if (isset($_POST['drop'])) {
-                $drop = $_POST['drop'] == 'Y';
-            }
-            if ($drop) {
-                $match = new Match($_POST['match_id']);
-                $eventname = $match->getEventNamebyMatchid();
-                $event = new Event($eventname);
-                $event->dropPlayer($player->name);
-            }
-            if ($_POST['opponent'] != '0') {
-                $event = new Event($_POST['event']);
-                if ($event->isLeague()) {
-                    $player = new Standings($event->name, $_POST['player']);
-                    $opponent = new Standings($event->name, $_POST['opponent']);
-                    $new_match_id = $event->addPairing($player, $opponent, $event->current_round, 'P');
-                    Match::saveReport($_POST['report'], $new_match_id, 'a');
-                } else {
-                    $result = 'This is not a league event!';
-                }
-            } else {
-                // Non-league matches
-                $match = new Match($_POST['match_id']);
-                if ($match->playerLetter($player->name) == $_POST['player']) {
-                    Match::saveReport($_POST['report'], $_POST['match_id'], $_POST['player']);
-                } else {
-                    $result = 'Results appear to be tampered.  Please only submit your own results.';
-                }
-            }
-        } elseif ($_POST['action'] == 'drop') {
-            // drop player from event
-            $event = new Event($_POST['event']);
-            $event->dropPlayer($player->name);
         }
     }
     // Handle modes
@@ -109,6 +74,15 @@
     }
 
     switch ($dispmode) {
+    case 'submit_result':
+    case 'submit_league_result':
+    case 'verify_result':
+    case 'verify_league_result':
+    case 'drop_form':
+        echo 'oops';
+
+    break;
+
     case 'alldecks':
     print_allContainer();
     break;
@@ -147,32 +121,6 @@
     print_editTimeZoneForm($player, $result);
     break;
 
-    case 'submit_result':
-    if (!isset($_GET['match_id'])) {
-        print_mainPlayerCP($player, '');
-        break;
-    }
-    print_submit_resultForm($_GET['match_id']);
-    break;
-
-    case 'submit_league_result':
-    League_print_submit_resultForm($_GET['event'], $_GET['round'], $player, $_GET['subevent']);
-    break;
-
-    case 'verify_result':
-    if (isset($_POST['report'])) {
-        $drop = (isset($_POST['drop'])) ? 'Y' : 'N';
-        print_verify_resultForm($_POST['report'], $_POST['match_id'], $_POST['player'], $drop, 0, 0);
-    } else {
-        print_submit_resultForm($_REQUEST['match_id']);
-    }
-    break;
-
-    // todo: Fold this into the above case
-    case 'verify_league_result':
-    print_verify_resultForm($_POST['report'], $_POST['match_id'], $_POST['player'], 'N', $_POST['opponent'], $_POST['event']);
-    break;
-
     case 'standings':
     Standings::printEventStandings($_GET['event'], Player::loginName());
     break;
@@ -185,37 +133,6 @@
     }
     break;
 
-    case 'drop_form':
-        $matches = $player->getCurrentMatches();
-        $event_name = $_REQUEST['event'];
-        $can_drop = true;
-        foreach ($matches as $match) {
-            if (strcasecmp($event_name, $match->getEventNamebyMatchid()) != 0) {
-                continue;
-            }
-            if ($match->verification == 'unverified') {
-                $player_number = $match->playerLetter($player->name);
-                if ($player_number == 'b' and ($match->playerb_wins + $match->playerb_losses) > 0) {
-                    // Fine.
-                } elseif ($player_number == 'a' and ($match->playera_wins + $match->playera_losses) > 0) {
-                    // Also Fine
-                } else {
-                    if ($match->player_reportable_check() == true) {
-                        $can_drop = false;
-                    }
-                }
-            } elseif ($match->verification == 'failed') {
-                $can_drop = false;
-            }
-        }
-
-        if ($can_drop) {
-            print_dropConfirm($event_name, $player);
-        } else {
-            print_submit_resultForm($match->id, true);
-        }
-    break;
-
     default:
     print_mainPlayerCP($player, $result);
     break;
@@ -228,160 +145,6 @@
 <?php print_footer(); ?>
 
 <?php
-//Drop confirmation form
-function print_dropConfirm($event_name, $player)
-{
-    echo '<center><h3>Drop Form</h3>';
-    echo "<center style=\"color: red; font-weight: bold;\">
-    Are you sure you want to drop? This cannot be undone. </center>\n";
-    echo "<center bold;\">Please be sure to submit a result for any active matches before you leave.</center>\n";
-    echo '<table class="form">';
-    echo '<tr><th>';
-    echo "<form action=\"player.php\" method=\"post\">\n";
-    echo "<input name=\"action\" type=\"hidden\" value=\"drop\" />\n";
-    echo "<input name=\"event\" type=\"hidden\" value=\"{$event_name}\" />\n";
-    echo "<input name=\"player\" type=\"hidden\" value=\"{$player->name}\" />\n";
-    echo "<input name=\"submit\" type=\"submit\" value=\"Drop from Event\" />\n";
-    echo '<td> ';
-    echo "</form>\n";
-    echo "<form action=\"player.php\" method=\"get\">\n";
-    echo "<input name=\"submit\" type=\"submit\" value=\"Cancel\" />\n";
-    echo "</td> </tr> \n";
-    echo "<tr> <td colspan=\"2\" class=\"buttons\">\n";
-    echo "</td> </tr> </table> \n";
-    echo "</form>\n";
-}
-
-function print_submit_resultForm($match_id, $drop = false)
-{
-    $match = new Match($match_id);
-    $event = new Event($match->getEventNamebyMatchid());
-    $letter = $match->playerLetter(Player::getSessionPlayer()->name);
-    if ($letter == 'a') {
-        $opp = $match->playerb;
-    } else {
-        $opp = $match->playera;
-    }
-    $oppplayer = new Player($opp);
-    echo "<center><h3>Report Game Results</h3>
-    Enter results for <em>$event->name</em> round $event->current_round vs. $oppplayer->name</center>\n";
-
-    echo "<form action=\"player.php\" method=\"post\">\n";
-    echo "<input name=\"mode\" type=\"hidden\" value=\"verify_result\" />\n";
-    echo "<input name=\"match_id\" type=\"hidden\" value=\"{$match_id}\" />\n";
-    echo "<input name=\"player\" type=\"hidden\" value=\"{$letter}\" />\n";
-    echo '<table class="form">';
-    echo "<tr><td><input type='radio' name='report' value='W20' /> I won the match 2-0</td> </tr>";
-    echo "<tr><td><input type='radio' name='report' value='W21' />I won the match 2-1</td> </tr>";
-    echo "<tr><td><input type='radio' name='report' value='L20' />I lost the match 0-2 </td> </tr>";
-    echo "<tr><td><input type='radio' name='report' value='L21' />I lost the match 1-2</td> </tr>";
-    if ($match->allowsPlayerReportedDraws() == 1) {
-        echo "<tr><td><input type='radio' name='report' value='D' />The match was a draw</td> </tr>";
-    }
-    echo '<tr><td></td></tr>';
-    if ($match->type !== 'Single Elimination') {
-        print_checkbox_input('I want to drop from this event', 'drop', $drop);
-    }
-    echo '<tr><td></td></tr>';
-    echo '<tr><td class="buttons">';
-    echo '<input class="inputbutton" name="submit" type="submit" value="Submit Match Report" />';
-    echo '</td></tr></table>';
-    echo '</form>';
-    echo '<div class="clear"></div>';
-}
-
-// *form to report League results
-function League_print_submit_resultForm($event, $round, $player, $subevent)
-{
-    echo "<center><h3>Report League Game Results</h3>
-    Enter results</center>\n";
-    echo "<center style=\" font-weight: bold;\">Opponent</center>\n";
-    echo "<form action=\"player.php\" method=\"post\">\n";
-    echo "<input name=\"mode\" type=\"hidden\" value=\"verify_league_result\" />\n";
-    echo "<input name=\"match_id\" type=\"hidden\" value=\"0\" />\n";
-    echo "<input name=\"event\" type=\"hidden\" value=\"{$event}\" />\n";
-    echo "<input name=\"player\" type=\"hidden\" value=\"{$player->name}\" />\n";
-    echo '<table class="form">';
-
-    echo '<tr><th>';
-    leagueOpponentDropMenu($event, $round, $player, $subevent);
-
-    echo "<br /></th>\n";
-    echo "<td></td></tr>\n";
-    echo "<tr><th><input type='radio' name='report' value='W20' /> I won the match 2-0<br /></th>\n";
-    echo "<td></td> </tr> \n";
-    echo "<tr><th><input type='radio' name='report' value='W21' />I won the match 2-1</th>\n";
-    echo "<td></td> </tr> \n";
-    echo "<tr> <td colspan=\"2\" class=\"buttons\">\n";
-    echo "<input class=\"inputbutton\" name=\"submit\" type=\"submit\" value=\"Submit Match Report\" />\n";
-    echo "</td> </tr> </table> \n";
-    echo "</form>\n";
-    echo "<div class=\"clear\"> </div>\n";
-}
-
-//* form to confirm submission
-function print_verify_resultForm($report, $match_id, $player, $drop, $opponent, $event)
-{
-    echo "<center><h3><br>Confirm Game Results</p></h3></center>\n";
-    echo "<center style=\"color: red; font-weight: bold;\">Please confirm your entry.</center></p>\n";
-    echo '<center><h4>';
-    if ($opponent != '0') {
-        echo 'Opponent: '.$opponent.'<br />';
-    }
-    switch ($report) {
-        case 'W20':
-            echo 'I won the match 2-0';
-            break;
-        case 'W21':
-            echo 'I won the match 2-1';
-            break;
-        case 'L20':
-            echo 'I lost the match 0-2';
-            break;
-        case 'L21':
-            echo 'I lost the match 1-2';
-            break;
-        case 'D':
-            echo 'The match was a draw';
-        break;
-    }
-    if ($drop == 1) {
-        $drop = 'Y';
-    }
-    if ($drop == 'Y') {
-        echo "</p><center style=\"color: red; font-weight: bold;\">I want to drop out of this event.</center>\n";
-    }
-    echo '</center></h4></p>';
-
-    echo '<table class="form">';
-    echo '<tr><th>';
-    echo "<form action=\"player.php\" method=\"post\">\n";
-    if ($drop == 'Y') {
-        echo "<input name=\"drop\" type=\"hidden\" value=\"Y\" />\n";
-    }
-    echo "<input name=\"action\" type=\"hidden\" value=\"finalize_result\" />\n";
-    echo "<input name=\"match_id\" type=\"hidden\" value=\"{$match_id}\" />\n";
-    echo "<input name=\"report\" type=\"hidden\" value=\"{$report}\" />\n";
-    echo "<input name=\"opponent\" type=\"hidden\" value=\"{$opponent}\" />\n";
-    echo "<input name=\"player\" type=\"hidden\" value=\"{$player}\" />\n";
-    echo "<input name=\"event\" type=\"hidden\" value=\"{$event}\" />\n";
-    echo "<input name=\"submit\" type=\"submit\" value=\"Verify Match Report\" />\n";
-    echo "</form>\n";
-    echo "</th>\n";
-    echo '<td> ';
-    echo "<form action=\"player.php\" method=\"get\">\n";
-    echo "<input name=\"match_id\" type=\"hidden\" value=\"{$match_id}\" />\n";
-    echo "<input name=\"player\" type=\"hidden\" value=\"{$player}\" />\n";
-    echo "<input name=\"mode\" type=\"hidden\" value=\"submit_result\" />\n";
-    echo "<input name=\"submit\" type=\"submit\" value=\"Go Back and Correct\" />\n";
-    echo "</form>\n";
-    echo "</td> </tr> \n";
-    echo "<tr> <td colspan=\"2\" class=\"buttons\">\n";
-
-    echo "</td> </tr> </table> \n";
-    echo "</form>\n";
-    echo "<div class=\"clear\"> </div>\n";
-}
 
 function print_changePassForm($player, $result)
 {
@@ -697,10 +460,10 @@ function print_ActiveEvents()
                 $round = 'main';
             }
             if ($structure == 'League') {
-                $Leagues[] = "<tr><td>{$event->name} Round: {$event->current_round}</td><td><a href=\"player.php?mode=submit_league_result&event={$event->name}&round={$event->current_round}&subevent={$subevent_id}\">Report League Game</a></td></tr>";
+                $Leagues[] = "<tr><td>{$event->name} Round: {$event->current_round}</td><td><a href=\"report.php?mode=submit_league_result&event={$event->name}&round={$event->current_round}&subevent={$subevent_id}\">Report League Game</a></td></tr>";
             }
             if ($structure !== 'Single Elimination') {
-                echo "<td><a href=\"player.php?mode=drop_form&event={$event->name}\">Drop From Event</a></td>";
+                echo "<td><a href=\"report.php?mode=drop_form&event={$event->name}\">Drop From Event</a></td>";
             }
         } else {
             // This doesn't account for the small amount of time where Event Start time has elapsed, but Round 1 hasn't started
@@ -857,13 +620,13 @@ function print_currentMatchTable($Leagues)
                     echo '(Report Submitted)';
                 } else {
                     if ($match->player_reportable_check() == true) {
-                        echo '<a href="player.php?mode=submit_result&match_id='.$match->id.'&player='.$player_number.'">(Report Result)</a>';
+                        echo '<a href="report.php?mode=submit_result&match_id='.$match->id.'&player='.$player_number.'">(Report Result)</a>';
                     } else {
                         echo 'Please report results in the report channel for this event';
                     }
                 }
             } elseif ($match->verification == 'failed') {
-                echo "<font style=\"color: red; font-weight: bold;\">The reported result wasn't consistent with your opponent's, please check with the host  </style><a href=\"player.php?mode=submit_result&match_id=".$match->id.'&player='.$player_number.'">(Correct Result)</a>';
+                echo "<font style=\"color: red; font-weight: bold;\">The reported result wasn't consistent with your opponent's, please check with the host  </style><a href=\"report.php?mode=submit_result&match_id=".$match->id.'&player='.$player_number.'">(Correct Result)</a>';
             } elseif ($match->result == 'BYE') {
             } else {
                 echo '(Reported)';
diff --git a/report.php b/report.php
new file mode 100644
index 0000000..e121e06
--- /dev/null
+++ b/report.php
@@ -0,0 +1,293 @@
+<?php
+require_once 'lib.php';
+require_once 'lib_form_helper.php';
+session_start();
+$player = Player::getSessionPlayer();
+$result = '';
+if ($player == null) {
+    linkToLogin('your Player Control Panel');
+} else {
+    if (isset($_POST['action'])) {
+        if ($_POST['action'] == 'finalize_result') {
+            // write results to matches table
+            $drop = false;
+            if (isset($_POST['drop'])) {
+                $drop = $_POST['drop'] == 'Y';
+            }
+            if ($drop) {
+                $match = new Match($_POST['match_id']);
+                $eventname = $match->getEventNamebyMatchid();
+                $event = new Event($eventname);
+                $event->dropPlayer($player->name);
+            }
+            if ($_POST['opponent'] != '0') {
+                $event = new Event($_POST['event']);
+                if ($event->isLeague()) {
+                    $player = new Standings($event->name, $_POST['player']);
+                    $opponent = new Standings($event->name, $_POST['opponent']);
+                    $new_match_id = $event->addPairing($player, $opponent, $event->current_round, 'P');
+                    Match::saveReport($_POST['report'], $new_match_id, 'a');
+                    redirect('player.php');
+
+                    return;
+                } else {
+                    $result = 'This is not a league event!';
+                }
+            } else {
+                // Non-league matches
+                $match = new Match($_POST['match_id']);
+                if ($match->playerLetter($player->name) == $_POST['player']) {
+                    Match::saveReport($_POST['report'], $_POST['match_id'], $_POST['player']);
+                    redirect('player.php');
+
+                    return;
+                } else {
+                    $result = 'Results appear to be tampered.  Please only submit your own results.';
+                }
+            }
+        } elseif ($_POST['action'] == 'drop') {
+            // drop player from event
+            $event = new Event($_POST['event']);
+            $event->dropPlayer($player->name);
+            redirect('player.php');
+
+            return;
+        }
+    }
+}
+print_header('Player Control Panel');
+?>
+<div class="grid_10 suffix_1 prefix_1">
+<div id="gatherling_main" class="box">
+<div class="uppertitle"> Player Control Panel </div>
+<?php
+    // Handle modes
+    $dispmode = 'playercp';
+    if (isset($_REQUEST['mode'])) {
+        $dispmode = $_REQUEST['mode'];
+    }
+
+    switch ($dispmode) {
+    case 'submit_result':
+    if (!isset($_GET['match_id'])) {
+        print_mainPlayerCP($player, '');
+        break;
+    }
+    print_submit_resultForm($_GET['match_id']);
+    break;
+
+    case 'submit_league_result':
+    League_print_submit_resultForm($_GET['event'], $_GET['round'], $player, $_GET['subevent']);
+    break;
+
+    case 'verify_result':
+    if (isset($_POST['report'])) {
+        $drop = (isset($_POST['drop'])) ? 'Y' : 'N';
+        print_verify_resultForm($_POST['report'], $_POST['match_id'], $_POST['player'], $drop, 0, 0);
+    } else {
+        print_submit_resultForm($_REQUEST['match_id']);
+    }
+    break;
+
+    // todo: Fold this into the above case
+    case 'verify_league_result':
+    print_verify_resultForm($_POST['report'], $_POST['match_id'], $_POST['player'], 'N', $_POST['opponent'], $_POST['event']);
+    break;
+
+    case 'drop_form':
+        $matches = $player->getCurrentMatches();
+        $event_name = $_REQUEST['event'];
+        $can_drop = true;
+        foreach ($matches as $match) {
+            if (strcasecmp($event_name, $match->getEventNamebyMatchid()) != 0) {
+                continue;
+            }
+            if ($match->verification == 'unverified') {
+                $player_number = $match->playerLetter($player->name);
+                if ($player_number == 'b' and ($match->playerb_wins + $match->playerb_losses) > 0) {
+                    // Fine.
+                } elseif ($player_number == 'a' and ($match->playera_wins + $match->playera_losses) > 0) {
+                    // Also Fine
+                } else {
+                    if ($match->player_reportable_check() == true) {
+                        $can_drop = false;
+                    }
+                }
+            } elseif ($match->verification == 'failed') {
+                $can_drop = false;
+            }
+        }
+
+        if ($can_drop) {
+            print_dropConfirm($event_name, $player);
+        } else {
+            print_submit_resultForm($match->id, true);
+        }
+    break;
+    default:
+    redirect('player.php');
+
+    return;
+    }
+?>
+</div> <!-- gatherling_main box -->
+</div> <!-- grid 10 suff 1 pre 1 -->
+
+<?php print_footer(); ?>
+
+<?php
+//Drop confirmation form
+function print_dropConfirm($event_name, $player)
+{
+    echo '<center><h3>Drop Form</h3>';
+    echo "<center style=\"color: red; font-weight: bold;\">
+    Are you sure you want to drop? This cannot be undone. </center>\n";
+    echo "<center bold;\">Please be sure to submit a result for any active matches before you leave.</center>\n";
+    echo '<table class="form">';
+    echo '<tr><th>';
+    echo "<form action=\"report.php\" method=\"post\">\n";
+    echo "<input name=\"action\" type=\"hidden\" value=\"drop\" />\n";
+    echo "<input name=\"event\" type=\"hidden\" value=\"{$event_name}\" />\n";
+    echo "<input name=\"player\" type=\"hidden\" value=\"{$player->name}\" />\n";
+    echo "<input name=\"submit\" type=\"submit\" value=\"Drop from Event\" />\n";
+    echo '<td> ';
+    echo "</form>\n";
+    echo "<form action=\"report.php\" method=\"get\">\n";
+    echo "<input name=\"submit\" type=\"submit\" value=\"Cancel\" />\n";
+    echo "</td> </tr> \n";
+    echo "<tr> <td colspan=\"2\" class=\"buttons\">\n";
+    echo "</td> </tr> </table> \n";
+    echo "</form>\n";
+}
+
+function print_submit_resultForm($match_id, $drop = false)
+{
+    $match = new Match($match_id);
+    $event = new Event($match->getEventNamebyMatchid());
+    $letter = $match->playerLetter(Player::getSessionPlayer()->name);
+    if ($letter == 'a') {
+        $opp = $match->playerb;
+    } else {
+        $opp = $match->playera;
+    }
+    $oppplayer = new Player($opp);
+    echo "<center><h3>Report Game Results</h3>
+    Enter results for <em>$event->name</em> round $event->current_round vs. $oppplayer->name</center>\n";
+
+    echo "<form action=\"report.php\" method=\"post\">\n";
+    echo "<input name=\"mode\" type=\"hidden\" value=\"verify_result\" />\n";
+    echo "<input name=\"match_id\" type=\"hidden\" value=\"{$match_id}\" />\n";
+    echo "<input name=\"player\" type=\"hidden\" value=\"{$letter}\" />\n";
+    echo '<table class="form">';
+    echo "<tr><td><input type='radio' name='report' value='W20' /> I won the match 2-0</td> </tr>";
+    echo "<tr><td><input type='radio' name='report' value='W21' />I won the match 2-1</td> </tr>";
+    echo "<tr><td><input type='radio' name='report' value='L20' />I lost the match 0-2 </td> </tr>";
+    echo "<tr><td><input type='radio' name='report' value='L21' />I lost the match 1-2</td> </tr>";
+    if ($match->allowsPlayerReportedDraws() == 1) {
+        echo "<tr><td><input type='radio' name='report' value='D' />The match was a draw</td> </tr>";
+    }
+    echo '<tr><td></td></tr>';
+    if ($match->type !== 'Single Elimination') {
+        print_checkbox_input('I want to drop from this event', 'drop', $drop);
+    }
+    echo '<tr><td></td></tr>';
+    echo '<tr><td class="buttons">';
+    echo '<input class="inputbutton" name="submit" type="submit" value="Submit Match Report" />';
+    echo '</td></tr></table>';
+    echo '</form>';
+    echo '<div class="clear"></div>';
+}
+
+// *form to report League results
+function League_print_submit_resultForm($event, $round, $player, $subevent)
+{
+    echo "<center><h3>Report League Game Results</h3>
+    Enter results</center>\n";
+    echo "<center style=\" font-weight: bold;\">Opponent</center>\n";
+    echo "<form action=\"report.php\" method=\"post\">\n";
+    echo "<input name=\"mode\" type=\"hidden\" value=\"verify_league_result\" />\n";
+    echo "<input name=\"match_id\" type=\"hidden\" value=\"0\" />\n";
+    echo "<input name=\"event\" type=\"hidden\" value=\"{$event}\" />\n";
+    echo "<input name=\"player\" type=\"hidden\" value=\"{$player->name}\" />\n";
+    echo '<table class="form">';
+
+    echo '<tr><th>';
+    leagueOpponentDropMenu($event, $round, $player, $subevent);
+
+    echo "<br /></th>\n";
+    echo "<td></td></tr>\n";
+    echo "<tr><th><input type='radio' name='report' value='W20' /> I won the match 2-0<br /></th>\n";
+    echo "<td></td> </tr> \n";
+    echo "<tr><th><input type='radio' name='report' value='W21' />I won the match 2-1</th>\n";
+    echo "<td></td> </tr> \n";
+    echo "<tr> <td colspan=\"2\" class=\"buttons\">\n";
+    echo "<input class=\"inputbutton\" name=\"submit\" type=\"submit\" value=\"Submit Match Report\" />\n";
+    echo "</td> </tr> </table> \n";
+    echo "</form>\n";
+    echo "<div class=\"clear\"> </div>\n";
+}
+
+//* form to confirm submission
+function print_verify_resultForm($report, $match_id, $player, $drop, $opponent, $event)
+{
+    echo "<center><h3><br>Confirm Game Results</p></h3></center>\n";
+    echo "<center style=\"color: red; font-weight: bold;\">Please confirm your entry.</center></p>\n";
+    echo '<center><h4>';
+    if ($opponent != '0') {
+        echo 'Opponent: '.$opponent.'<br />';
+    }
+    switch ($report) {
+        case 'W20':
+            echo 'I won the match 2-0';
+            break;
+        case 'W21':
+            echo 'I won the match 2-1';
+            break;
+        case 'L20':
+            echo 'I lost the match 0-2';
+            break;
+        case 'L21':
+            echo 'I lost the match 1-2';
+            break;
+        case 'D':
+            echo 'The match was a draw';
+        break;
+    }
+    if ($drop == 1) {
+        $drop = 'Y';
+    }
+    if ($drop == 'Y') {
+        echo "</p><center style=\"color: red; font-weight: bold;\">I want to drop out of this event.</center>\n";
+    }
+    echo '</center></h4></p>';
+
+    echo '<table class="form">';
+    echo '<tr><th>';
+    echo "<form action=\"report.php\" method=\"post\">\n";
+    if ($drop == 'Y') {
+        echo "<input name=\"drop\" type=\"hidden\" value=\"Y\" />\n";
+    }
+    echo "<input name=\"action\" type=\"hidden\" value=\"finalize_result\" />\n";
+    echo "<input name=\"match_id\" type=\"hidden\" value=\"{$match_id}\" />\n";
+    echo "<input name=\"report\" type=\"hidden\" value=\"{$report}\" />\n";
+    echo "<input name=\"opponent\" type=\"hidden\" value=\"{$opponent}\" />\n";
+    echo "<input name=\"player\" type=\"hidden\" value=\"{$player}\" />\n";
+    echo "<input name=\"event\" type=\"hidden\" value=\"{$event}\" />\n";
+    echo "<input name=\"submit\" type=\"submit\" value=\"Verify Match Report\" />\n";
+    echo "</form>\n";
+    echo "</th>\n";
+    echo '<td> ';
+    echo "<form action=\"report.php\" method=\"get\">\n";
+    echo "<input name=\"match_id\" type=\"hidden\" value=\"{$match_id}\" />\n";
+    echo "<input name=\"player\" type=\"hidden\" value=\"{$player}\" />\n";
+    echo "<input name=\"mode\" type=\"hidden\" value=\"submit_result\" />\n";
+    echo "<input name=\"submit\" type=\"submit\" value=\"Go Back and Correct\" />\n";
+    echo "</form>\n";
+    echo "</td> </tr> \n";
+    echo "<tr> <td colspan=\"2\" class=\"buttons\">\n";
+
+    echo "</td> </tr> </table> \n";
+    echo "</form>\n";
+    echo "<div class=\"clear\"> </div>\n";
+}
+?>
diff --git a/util/decktest.php b/util/decktest.php
index 9d35898..cb05697 100644
--- a/util/decktest.php
+++ b/util/decktest.php
@@ -56,7 +56,7 @@ function scoredeck($id, $type, $db)
 {
     $score = 0;
     $convarr = ['Weak' => 1,   'Moderate' => 2,
-           'Strong'    => 4, 'Required' => 4, ];
+        'Strong'       => 4, 'Required' => 4, ];
     $query = "SELECT ti.strength, dc.qty
     FROM typeinfo ti
     LEFT OUTER JOIN deckcontents AS dc