diff --git a/Packages/lesiontracker/client/collections/LocationResponses.js b/Packages/lesiontracker/client/collections/LocationResponses.js
index 990adc091..dff9eaff2 100644
--- a/Packages/lesiontracker/client/collections/LocationResponses.js
+++ b/Packages/lesiontracker/client/collections/LocationResponses.js
@@ -21,7 +21,7 @@ LocationResponses.insert({
 
 LocationResponses.insert({
     text: 'Present',
-    code: false,
+    code: 'Present',
     description: ''
 });
 
@@ -42,3 +42,10 @@ LocationResponses.insert({
     code: 'EX',
     description: ''
 });
+
+// TODO: Check if this is a copy of Not evaluable?
+LocationResponses.insert({
+    text: 'Non-measurable',
+    code: 'NM',
+    description: ''
+});
\ No newline at end of file
diff --git a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html
index 3cdf5dd2a..9da09caa5 100644
--- a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html
+++ b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.html
@@ -16,12 +16,11 @@
             <div class="locationResponse">
                 <label>Response</label>
                 <select id="selectNonTargetLesionLocationResponse">
-                    <option value="-1"></option>
                     {{ #each locationResponses}}
                     {{ #if code }}
-                        <option value={{code}}>{{code}} - {{text}}</option>
+                        <option value={{code}} selected={{selected}}>{{code}} - {{text}}</option>
                     {{ else }}
-                        <option value={{text}}>{{text}}</option>
+                        <option value={{text}} selected={{selected}}>{{text}}</option>
                     {{ /if }}
                     {{ /each}}
                 </select>
@@ -49,7 +48,6 @@
             <div class="locationResponse">
                 <label>Response</label>
                 <select id="selectNonTargetLesionLocationResponse">
-                    <option value="-1"></option>
                     {{ #each locationResponses}}
                     {{ #if code }}
                     <option value={{code}} selected={{selected}}>{{code}} - {{text}}</option>
diff --git a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js
index bd2a5baf0..2259fde73 100644
--- a/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js
+++ b/Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js
@@ -40,6 +40,31 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
     doneCallback(lesionNumber);
 }
 
+function selectNonTargetResponse(responseCode) {
+    // First, disable all other responses
+    LocationResponses.update({}, {
+        $set: {
+            selected: false
+        }
+    }, {
+        multi: true
+    });
+
+    // If no response code is specified, leave them all disabled
+    if (!responseCode) {
+        return;
+    }
+
+    // Find the specified response by code and set it as selected
+    LocationResponses.update({
+        code: responseCode
+    }, {
+        $set: {
+            selected: true
+        }
+    });
+}
+
 // This event determines whether or not to show the Non-Target lesion dialog
 // If there already exists a lesion with this specific lesion number,
 // related to the chosen location.
@@ -60,10 +85,21 @@ function getLesionLocationCallback(measurementData, eventData) {
 
     // Find the select option box
     var selectorLocation = dialog.find('select#selectNonTargetLesionLocation');
-    var selectorResponse = dialog.find('select#selectNonTargetLesionLocationResponse');
 
     selectorLocation.find('option:first').prop('selected', 'selected');
-    selectorResponse.find('option:first').prop('selected', 'selected');
+
+    // LT-112 "Non-target response shall default to non-measurable on baseline, present on follow-up"
+    var timepoint = Timepoints.findOne({
+        timepointId: measurementData.timepointId
+    });
+
+    if (timepoint && timepoint.timepointType === 'baseline') {
+        selectNonTargetResponse('NM');
+    } else if (timepoint && timepoint.timepointType === 'followup') {
+        selectNonTargetResponse('Present');
+    } else {
+        selectNonTargetResponse();
+    }
 
     // Allow location selection
     selectorLocation.removeAttr('disabled');
@@ -183,15 +219,13 @@ changeNonTargetLocationCallback = function(measurementData, eventData, doneCallb
         return;
     }
 
-    LesionLocations.update({},
-        {
-            $set: {
-                selected: false
-            }
-        },
-        {
-            multi: true
-        });
+    LesionLocations.update({}, {
+        $set: {
+            selected: false
+        }
+    }, {
+        multi: true
+    });
 
     var currentLocation = LesionLocations.findOne({
         id: measurement.locationId
@@ -207,33 +241,8 @@ changeNonTargetLocationCallback = function(measurementData, eventData, doneCallb
         }
     });
 
-    LocationResponses.update({},
-        {
-            $set: {
-                selected: false
-            }
-        },
-        {
-            multi: true
-        });
-
     var response = measurement.timepoints[measurementData.timepointId].response;
-
-    // TODO = Standardize this. Searching by code probably isn't the best, we should use
-    // some sort of UID
-    var currentResponse = LocationResponses.findOne({
-        code: response
-    });
-
-    if (!currentResponse) {
-        return;
-    }
-
-    LocationResponses.update(currentResponse._id, {
-        $set: {
-            selected: true
-        }
-    });
+    selectNonTargetResponse(response);
 };
 
 var config = {
@@ -245,17 +254,19 @@ var config = {
 cornerstoneTools.nonTarget.setConfiguration(config);
 
 Template.nonTargetLesionDialog.events({
+    'change #selectNonTargetLesionLocationResponse': function(e) {
+        var responseCode = $(e.currentTarget).val();
+        selectNonTargetResponse(responseCode);
+    },
     'click #nonTargetLesionOK': function() {
         var dialog = Template.nonTargetLesionDialog.dialog;
         var measurementData = Template.nonTargetLesionDialog.measurementData;
 
         // Find the select option box
         var selectorLocation = dialog.find('select#selectNonTargetLesionLocation');
-        var selectorResponse = dialog.find('select#selectNonTargetLesionLocationResponse');
 
         // Get the current value of the selector
         var selectedOptionId = selectorLocation.find('option:selected').val();
-        var responseOptionId = selectorResponse.find('option:selected').val();
 
         // If the selected option is still the default (-1)
         // then stop here
@@ -263,12 +274,6 @@ Template.nonTargetLesionDialog.events({
             return;
         }
 
-        // If the selected response option is still the default (-1)
-        // then stop here
-        if (responseOptionId < 0) {
-            return;
-        }
-
         // Get selected location data
         var locationObj = LesionLocations.findOne({
             _id: selectedOptionId
@@ -279,7 +284,7 @@ Template.nonTargetLesionDialog.events({
             Measurements.update(measurementData.id, {
                 $set: {
                     location: locationObj.location,
-                    locationId: locationObj.id,
+                    locationId: locationObj.id
                 }
             });
         } else {
@@ -291,7 +296,7 @@ Template.nonTargetLesionDialog.events({
         measurementData.isTarget = false;
 
         // Response is set from location response list
-        measurementData.response = responseOptionId;
+        measurementData.response = LocationResponses.findOne({selected: true}).code;
 
         // Adds lesion data to timepoints array
         LesionManager.updateLesionData(measurementData);
diff --git a/Packages/lesiontracker/lib/LesionManager.js b/Packages/lesiontracker/lib/LesionManager.js
index 283bd8c4c..bb2a0f08b 100644
--- a/Packages/lesiontracker/lib/LesionManager.js
+++ b/Packages/lesiontracker/lib/LesionManager.js
@@ -61,8 +61,8 @@ function updateLesionData(lesionData) {
     };
 
     if (!lesionData.measurementType) {
-        // For debugging
-        log.warn('No MeasurementType available?');
+        // For debugging, might want to switch to measurement types later
+        lesionData.measurementType = lesionData.isTarget ? 'bidirectional' : 'nonTarget';
     }
 
     // Populate this timepoint's data with whichever values