diff --git a/app/event.php b/app/event.php
index ec74f1a..ca657b0 100644
--- a/app/event.php
+++ b/app/event.php
@@ -412,6 +412,17 @@ public static function addNewEvent($data)
             file_put_contents(KARTAT_DIRECTORY."kilpailijat_".$newid.".txt", $result, FILE_APPEND);
         }
 
+        // create new mappings file: result classname|coursename|courseid so we can match them up again for updates. 
+        // may be able to use the sarjat file but don't want to touch it - I don't know what it could break in RG1
+        for ($i = 1; $i < count($data->mappings); $i++) {
+            $class = utils::encode_rg_output($data->mappings[$i]->class);
+            $course = utils::encode_rg_output($data->mappings[$i]->course);
+            $courseid = utils::encode_rg_output($data->mappings[$i]->courseid);
+
+            $classmapping = $class."|".$course."|".$courseid.PHP_EOL;
+            file_put_contents(KARTAT_DIRECTORY."mappings_".$newid.".txt", $classmapping, FILE_APPEND);
+        }
+
         if ($write["status_msg"] == "") {
             $write["ok"] = true;
             $write["status_msg"] = "Event created.";
@@ -441,7 +452,7 @@ public static function deleteEvent($eventid)
 
         // rename all associated files but don't worry about errors
         // safer than deleting them since you can always add the event again
-        $files = array("kilpailijat_", "kommentit_", "hajontakanta_", "merkinnat_", "radat_", "ratapisteet_", "sarjat_", "sarjojenkoodit_");
+        $files = array("kilpailijat_", "kommentit_", "hajontakanta_", "merkinnat_", "radat_", "ratapisteet_", "sarjat_", "sarjojenkoodit_", "mappings_");
         foreach ($files as $file) {
             @rename(KARTAT_DIRECTORY.$file.$eventid.".txt", KARTAT_DIRECTORY."deleted_".$file.$eventid.".txt");
         }
@@ -569,4 +580,4 @@ public static function fixResults($id) {
       utils::unlockDatabase();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/result.php b/app/result.php
index 9af2a42..60aaad3 100644
--- a/app/result.php
+++ b/app/result.php
@@ -193,6 +193,209 @@ private static function isDefaultComment($comment)
         return false;
     }
 
+    public static function updateResults($eventid, $data){
+
+		$date = date("Y-m-dTHis");
+        $write["status_msg"] = "";
+        
+        utils::rg2log("Updating result files for ".$eventid.". Old data will have datestamp: ".$date.".txt");
+
+
+        //Archive old kilpailijat file
+        rename(KARTAT_DIRECTORY."kilpailijat_".$eventid.".txt",
+        KARTAT_DIRECTORY."kilpailijat_".$eventid."_rm_".$date.".txt");
+
+
+		// create new kilpailijat file: results
+		for ($i = 0; $i < count($data->results); $i++) {
+		    $a = $data->results[$i];
+
+			// save position and status if we got them
+			if (isset($a->position)) {
+				$position = $a->position;
+			} else {
+				$position = '';
+			}
+			if (isset($a->status)) {
+				$status = utils::abbreviateStatus($a->status);
+			} else {
+				$status = '';
+			}
+
+			// course provided by json is actually result class - get correct course name
+			// based on mapping file, and load to txt file if not "Do not save"
+			$coursename = "";
+			$courseid = "";
+            $fh = fopen(KARTAT_DIRECTORY."mappings_".$eventid.".txt", 'r');
+            while ($oldrow = fgets($fh)) {
+                $row = explode("|", $oldrow);
+                if (utils::encode_rg_output($a->course) == $row[0]) {
+                    $coursename = $row[1];
+                    $courseid = $row[2]; 
+                    break;
+				}
+			}
+
+			if($coursename !== "Do not save"){
+				$result = ($i + 1)."|".trim($courseid)."|".utils::encode_rg_output($coursename);
+				$result .= "|".utils::encode_rg_output(trim($a->name))."|".$a->starttime."|";
+				// abusing dbid to save status and position
+				$result .= utils::encode_rg_output($a->dbid)."_#".$position."#".$status;
+				$result .= "|".$a->variantid."|".$a->time."|".$a->splits.PHP_EOL;
+				file_put_contents(KARTAT_DIRECTORY."kilpailijat_".$eventid.".txt", $result, FILE_APPEND);
+			}
+		}
+
+
+        // Get orig and new resultid so we can replace them in comments and routes files
+        // 1|1|C2|Bridget Anderson|35700|121_#1#OK||00:51:36|
+
+        $kilpailijat = array();
+
+        $fh = fopen(KARTAT_DIRECTORY."kilpailijat_".$eventid."_rm_".$date.".txt", 'r');
+        while ($oldrow = fgets($fh)) {
+
+            $old = explode("|", $oldrow);
+
+            $fh = fopen(KARTAT_DIRECTORY."kilpailijat_".$eventid.".txt", 'r');
+            while ($newrow = fgets($fh)) {
+
+                $new = explode("|", $newrow);
+
+                if ($new[3] == $old[3] && $new[2] == $old[2]){
+
+                    $row = array();
+                    $row["origresultid"] = $old[0];
+                    $row["newresultid"] = $new[0];
+                    $row["origcourseid"] = $old[1];
+                    $row["newcourseid"] = $new[1];
+                    $row["coursename"] = $old[2];
+                    $row["name"] = $old[3];
+                    $kilpailijat[] = $row;
+
+                    break;
+                }
+            }
+        }
+
+        // Add GPS routes from old file
+        $fh = fopen(KARTAT_DIRECTORY."kilpailijat_".$eventid."_rm_".$date.".txt", 'r');
+        while ($oldrow = fgets($fh)) {
+
+            $old = explode("|", $oldrow);
+            
+            if (strpos($old[3], 'GPS ') !== false){
+
+                // Get the current Id for the non-GPS record
+                        
+                foreach ($kilpailijat as $kil){
+
+                    if (substr($old[3], 5) == $kil["name"] && 
+                        $old[2] == $kil["coursename"]){
+                            
+                        $row = array();
+                        $row["origresultid"] = $old[0];
+                        $row["newresultid"] = GPS_RESULT_OFFSET + $kil["newresultid"];
+                        $row["origcourseid"] = $old[1];
+                        $row["newcourseid"] = $kil["newcourseid"];
+                        $row["coursename"] = $old[2];
+                        $row["name"] = $old[3];
+                        $kilpailijat[] = $row;
+
+                        $result = $row["newresultid"]."|".$row["newcourseid"]."|".$row["coursename"];
+                        $result .= "|".$row["name"]."|".$old[4]."|".$old[5]."|".$old[6]."|".$old[7]."|".$old[8]."|".$old[9];
+
+                        file_put_contents(KARTAT_DIRECTORY."kilpailijat_".$eventid.".txt", $result, FILE_APPEND);
+
+                        break;
+                        
+                    }
+                }
+            }
+        }
+
+        if (file_exists(KARTAT_DIRECTORY."kommentit_".$eventid.".txt")){
+
+            // Recreate kommentit file
+            // Replace old course id and result id with ones from new kilpailijat file
+            // Kommentit format:  2|34|Jake Hanson||test
+
+            $updatedfile = array();
+            $fh = fopen(KARTAT_DIRECTORY."/kommentit_".$eventid.".txt", 'r');
+            while ($oldrow = fgets($fh)) {
+                
+                $olddata = explode("|", $oldrow);
+
+                foreach ($kilpailijat as $k){
+                    if ($k["origresultid"] == $olddata[1]){
+
+                        $row = $k["newcourseid"]."|".$k["newresultid"]."|".$olddata[2]."|".$olddata[3]."|".$olddata[4];
+
+                        $updatedfile[] = $row;
+
+                        break;
+
+                    }
+                }
+            }
+
+            //Archive old file
+            rename(KARTAT_DIRECTORY."kommentit_".$eventid.".txt",
+            KARTAT_DIRECTORY."kommentit_".$eventid."_rm_".$date.".txt");
+
+            //Write new file
+            file_put_contents(KARTAT_DIRECTORY."kommentit_".$eventid.".txt", $updatedfile);
+            utils::rg2log("Updated route comments file ");
+        }
+        
+        if (file_exists(KARTAT_DIRECTORY."merkinnat_".$eventid.".txt")){
+
+
+            // Recreate merkinnat file
+            // Replace old course id and result id with ones from new kilpaijat file
+            // Merkinnat format: 2|34|Jake Hanson|null|Semicolon-separated results
+
+            $updatedfile = array();
+            $fh = fopen(KARTAT_DIRECTORY."merkinnat_".$eventid.".txt", 'r');
+            while ($oldrow = fgets($fh)) {
+                    $olddata = explode("|", $oldrow);
+
+                    foreach ($kilpailijat as $k){
+                        if ($k["origresultid"] == $olddata[1]){
+
+                            $row = $k["newcourseid"]."|".$k["newresultid"]."|".$olddata[2]."|".$olddata[2]."|".$olddata[4];
+
+                            $updatedfile[] = $row;
+
+                            break;
+
+                        }
+                    }
+                
+            }
+
+            //Archive old file
+            rename(KARTAT_DIRECTORY."merkinnat_".$eventid.".txt",
+            KARTAT_DIRECTORY."merkinnat_".$eventid."_rm_".$date.".txt");
+
+            //Write updated file
+            file_put_contents(KARTAT_DIRECTORY."merkinnat_".$eventid.".txt", $updatedfile);
+            utils::rg2log("Updated routes file");
+
+        }
+
+		if ($write["status_msg"] == "") {
+		    $write["ok"] = true;
+		    $write["status_msg"] = "Results updated.";
+		} else {
+		    $write["ok"] = false;
+		}
+		utils::rg2log("Updated results file ");
+		return $write;
+
+		utils::unlockDatabase();
+    }
+
     private static function sortResultsByCourseThenTime($a, $b)
     {
       if (intval($a["courseid"]) !== intval($b["courseid"])) {
@@ -200,4 +403,4 @@ private static function sortResultsByCourseThenTime($a, $b)
       }
       return (intval($a["secs"]) - intval($b["secs"]));
     }
-}
\ No newline at end of file
+}
diff --git a/html/manager.html b/html/manager.html
index f0c255f..08f0778 100644
--- a/html/manager.html
+++ b/html/manager.html
@@ -55,6 +55,7 @@ <h3 class="no-top-margin">Courses</h3>
     <span>Move map and controls together <input type="checkbox" id="btn-move-map-and-controls"></span>
   </div>
   <div id="rg2-course-allocations"></div>
+  <button type="button" id="btn-add-fieldmapping">Add class-course pair</button>
   <hr class="rg2-hr">
   <div>
     <span>Read-only (enable drawing via "Edit event" tab) <input type="checkbox" id="chk-read-only"></span>
@@ -95,6 +96,12 @@ <h3 class="no-top-margin">Delete route</h3>
       <br/>
       <button type="button" class="manage-file-label" id="btn-delete-route">Delete</button>
     </div>
+    <div>
+        <hr class="rg2-hr">
+        <h3 class="no-top-margin">Update results</h3>
+        <span>Results file<input type='file' accept='.csv, .xml' id='rg2-update-results-file' class="pushright manage-file-input" /></span>
+        <button type="button" class="manage-file-label" id="btn-update-results">Update results</button>
+    </div>
     <hr class="rg2-hr">
     <h3 class="no-top-margin">Delete event</h3>
     <div id="manage-delete-event">
diff --git a/js/manager.js b/js/manager.js
index 2238e2f..b038e17 100644
--- a/js/manager.js
+++ b/js/manager.js
@@ -122,6 +122,9 @@
       $("#btn-update-event").button().click(function () {
         self.confirmUpdateEvent();
       }).button("disable");
+      $("#btn-update-results").button().click(function () {
+        self.confirmUpdateResults();
+      }).button("disable");
       $("#btn-delete-route").button().click(function () {
         self.confirmDeleteRoute();
       }).button("disable");
@@ -171,6 +174,21 @@
       }).change(function (evt) {
         self.readCourses(evt);
       });
+        $("#btn-add-fieldmapping").button().click(function () {
+            self.addFieldMapping();
+        });
+
+      $("#rg2-update-results-file").button().click(function (evt) {
+        if (!self.mapLoaded) {
+          rg2.utils.showWarningDialog("No event loaded", "Please select an event before adding results.");
+          evt.preventDefault();
+        }
+      }).change(function (evt) {
+        self.resultsOrCourseFile = evt.target.files[0];
+        self.initialiseEncodings();
+        self.readResults();
+      });
+
     },
 
     validateMapUpload: function (upload) {
@@ -345,6 +363,18 @@
       }
     },
 
+      addFieldMapping: function () {
+
+          var tableEnd = "</tbody></table></div>";
+
+          var html1 = $("#rg2-course-allocations").html().replace(tableEnd, "");
+
+          var html2 = "<tr><td><input type=\"text\"/></td><td>" + this.createCourseDropdown("New Class", 1) + "</td></tr>";
+          var html = html1 + html2 + tableEnd
+
+          $("#rg2-course-allocations").empty().append(html);
+      },
+
     validateData: function () {
       if (!this.eventName) {
         return 'Event name is not valid.';
@@ -484,12 +514,42 @@
         delete data.results[i].chipid;
         delete data.results[i].club;
       }
+      data.mappings = this.generateFieldMappings(data.courses);
       user = this.user.encodeUser();
       data.x = user.x;
       data.y = user.y;
       return JSON.stringify(data);
     },
 
+    generateFieldMappings: function (courses) {
+      console.log(courses);
+        data = [];
+        $('#rg2-course-allocations tr').each(function (i, row) {
+            var $row = $(row);
+            $class = $row.find('td:first').text();
+
+            //could be manual input - try input instead
+            if ($class.length == 0){
+              $class = $row.find('input').val();
+            }
+            $course = $row.find(':selected').text();
+
+            $courseid = 0
+            //Get courseids
+            for (var i = 0; i<courses.length; i++){
+              if (courses[i].name == $course){
+                $courseid = courses[i].courseid;
+              }
+            }
+
+            data.push({
+                "class": $class, "course": $course, "courseid":$courseid })
+        })
+
+        return data;
+    },
+
+
     hasZeroTime: function (time) {
       if (time === 0 || time === '0' || time === '0:00' || time === '00:00') {
         return true;
@@ -1502,7 +1562,65 @@
       $("#rg2-world-file-map").show();
       this.georefmap.invalidateSize();
       this.georefmap.fitBounds(poly.getBounds());
-    }
+  },
+
+  confirmUpdateResults : function () {
+    var self, data, id;
+    $("#event-create-dialog").dialog("destroy");
+    self = this;
+    data = this.generateUpdatedResults();
+    $("#rg2-load-progress-label").text("Creating event");
+      $("#rg2-load-progress").show();
+      id = $("#rg2-event-selected").val();
+    console.log(data)
+      $.ajax({
+          data: data,
+          type : "POST",
+          url: rg2Config.json_url + "?type=updateresults&id=" + id,
+      dataType : "json",
+      success : function (data) {
+        // save new cookie
+        self.user.y = data.keksi;
+        if (data.ok) {
+          rg2.utils.showWarningDialog("Results updated.", "Results have been updated.");
+          // open newly created event in a separate window
+          window.open(rg2Config.json_url.replace("rg2api.php", "") + "#" + data.newid);
+          rg2.getEvents();
+          rg2.managerUI.setEvent();
+        } else {
+          rg2.utils.showWarningDialog("Save failed", data.status_msg + " Failed to update results. Please try again.");
+        }
+      },
+      error : function () {
+        rg2.utils.showWarningDialog("Save failed", " Failed to update results.");
+      },
+      complete : function () {
+        $("#rg2-load-progress-label").text("");
+        $("#rg2-load-progress").hide();
+      }
+     });
+    },
+
+    generateUpdatedResults : function () {
+
+      var data, user;
+        data = {};
+        data.results = this.results.slice(0);
+
+        for (i = 0; i < data.results.length; i += 1) {
+            data.results[i].variantid=0
+        }
+
+
+      user = this.user.encodeUser();
+      data.x = user.x;
+      data.y = user.y;
+      
+      return JSON.stringify(data);
+
+    },
+
+
   };
   rg2.Manager = Manager;
 }());
diff --git a/js/managerui.js b/js/managerui.js
index 0ce7935..8df04f5 100644
--- a/js/managerui.js
+++ b/js/managerui.js
@@ -137,7 +137,7 @@
       $("#rg2-event-level-edit").val(event.rawtype);
       $("#rg2-edit-event-comments").empty().val(rg2.he.decode(event.comment));
       $("#chk-edit-read-only").prop("checked", event.locked);
-      rg2.utils.setButtonState("enable", ["#btn-delete-event", "#btn-update-event", "#btn-delete-route"]);
+      rg2.utils.setButtonState("enable", ["#btn-delete-event", "#btn-update-event", "#btn-delete-route", "#btn-update-results"]);
       this.createRouteDeleteDropdown(event.id);
     },
 
diff --git a/rg2api.php b/rg2api.php
index f190766..2779abb 100644
--- a/rg2api.php
+++ b/rg2api.php
@@ -112,6 +112,13 @@ function handlePostRequest($type, $eventid)
         @unlink(CACHE_DIRECTORY."stats.json");
        break;
 
+      case 'updateresults':
+          // this a modified editevent function
+        $write = result::updateResults($eventid, $data);
+        @unlink(CACHE_DIRECTORY."events.json");
+        @unlink(CACHE_DIRECTORY."stats.json");
+        break;
+
       case 'deleteroute':
           // this is the manager delete function
         $write = route::deleteRoute($eventid);