diff --git a/apps/esmtool/CMakeLists.txt b/apps/esmtool/CMakeLists.txt
index 5b2f846e2..583f1fabd 100644
--- a/apps/esmtool/CMakeLists.txt
+++ b/apps/esmtool/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(esmtool
   ${ESMTOOL}
   ${MISC} ${MISC_HEADER}
   ${TO_UTF8}
+  ${ESM}
 )
 
 target_link_libraries(esmtool
diff --git a/components/esm/load_impl.cpp b/components/esm/load_impl.cpp
index 28ae402de..8857c1ae8 100644
--- a/components/esm/load_impl.cpp
+++ b/components/esm/load_impl.cpp
@@ -45,4 +45,113 @@ namespace ESM
 
     esm.skipRecord();
   }
+
+  void DialInfo::load(ESMReader &esm)
+  {
+    id = esm.getHNString("INAM");
+    prev = esm.getHNString("PNAM");
+    next = esm.getHNString("NNAM");
+
+    // Not present if deleted
+    if(esm.isNextSub("DATA"))
+      esm.getHT(data, 12);
+
+    // What follows is somewhat spaghetti-ish, but it's worth if for
+    // an extra speedup. INFO is by far the most common record type.
+
+    // subName is a reference to the original, so it changes whenever
+    // a new sub name is read. esm.isEmptyOrGetName() will get the
+    // next name for us, or return true if there are no more records.
+    esm.getSubName();
+    const NAME &subName = esm.retSubName();
+
+    if(subName.val == REC_ONAM)
+      {
+        actor = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+    if(subName.val == REC_RNAM)
+      {
+        race = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+    if(subName.val == REC_CNAM)
+      {
+        clas = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+
+    factionLess = false;
+    if(subName.val == REC_FNAM)
+      {
+        npcFaction = esm.getHString();
+	if(npcFaction == "FFFF") factionLess = true;
+	if(esm.isEmptyOrGetName()) return;
+      }
+    if(subName.val == REC_ANAM)
+      {
+	cell = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+    if(subName.val == REC_DNAM)
+      {
+        pcFaction = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+    if(subName.val == REC_SNAM)
+      {
+        sound = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+    if(subName.val == REC_NAME)
+      {
+	response = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+
+    while(subName.val == REC_SCVR)
+      {
+        SelectStruct ss;
+
+        ss.selectRule = esm.getHString();
+        esm.isEmptyOrGetName();
+
+        if(subName.val == REC_INTV)
+          {
+            ss.type = VT_Int;
+            esm.getHT(ss.i);
+          }
+        else if(subName.val == REC_FLTV)
+          {
+            ss.type = VT_Float;
+            esm.getHT(ss.f);
+          }
+        else
+          esm.fail("INFO.SCVR must precede INTV or FLTV, not "
+		   + subName.toString());
+
+        selects.push_back(ss);
+
+	if(esm.isEmptyOrGetName()) return;
+      }
+
+    if(subName.val == REC_BNAM)
+      {
+	resultScript = esm.getHString();
+	if(esm.isEmptyOrGetName()) return;
+      }
+
+    questStatus = QS_None;
+
+    if     (subName.val == REC_QSTN) questStatus = QS_Name;
+    else if(subName.val == REC_QSTF) questStatus = QS_Finished;
+    else if(subName.val == REC_QSTR) questStatus = QS_Restart;
+    else if(subName.val == REC_DELE) questStatus = QS_Deleted;
+    else
+      esm.fail("Don't know what to do with " + subName.toString() + " in INFO " + id);
+
+    if(questStatus != QS_None)
+      // Skip rest of record
+      esm.skipRecord();
+  }
 }
diff --git a/components/esm/loadinfo.hpp b/components/esm/loadinfo.hpp
index 787e6424e..480deda73 100644
--- a/components/esm/loadinfo.hpp
+++ b/components/esm/loadinfo.hpp
@@ -96,114 +96,7 @@ struct DialInfo
       REC_DELE = 0x454c4544
     };
 
-  void load(ESMReader &esm)
-  {
-    id = esm.getHNString("INAM");
-    prev = esm.getHNString("PNAM");
-    next = esm.getHNString("NNAM");
-
-    // Not present if deleted
-    if(esm.isNextSub("DATA"))
-      esm.getHT(data, 12);
-
-    // What follows is somewhat spaghetti-ish, but it's worth if for
-    // an extra speedup. INFO is by far the most common record type.
-
-    // subName is a reference to the original, so it changes whenever
-    // a new sub name is read. esm.isEmptyOrGetName() will get the
-    // next name for us, or return true if there are no more records.
-    esm.getSubName();
-    const NAME &subName = esm.retSubName();
-
-    if(subName.val == REC_ONAM)
-      {
-        actor = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-    if(subName.val == REC_RNAM)
-      {
-        race = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-    if(subName.val == REC_CNAM)
-      {
-        clas = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-
-    factionLess = false;
-    if(subName.val == REC_FNAM)
-      {
-        npcFaction = esm.getHString();
-	if(npcFaction == "FFFF") factionLess = true;
-	if(esm.isEmptyOrGetName()) return;
-      }
-    if(subName.val == REC_ANAM)
-      {
-	cell = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-    if(subName.val == REC_DNAM)
-      {
-        pcFaction = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-    if(subName.val == REC_SNAM)
-      {
-        sound = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-    if(subName.val == REC_NAME)
-      {
-	response = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-
-    while(subName.val == REC_SCVR)
-      {
-        SelectStruct ss;
-
-        ss.selectRule = esm.getHString();
-        esm.isEmptyOrGetName();
-
-        if(subName.val == REC_INTV)
-          {
-            ss.type = VT_Int;
-            esm.getHT(ss.i);
-          }
-        else if(subName.val == REC_FLTV)
-          {
-            ss.type = VT_Float;
-            esm.getHT(ss.f);
-          }
-        else 
-          esm.fail("INFO.SCVR must precede INTV or FLTV, not "
-		   + subName.toString());
-
-        selects.push_back(ss);
-
-	if(esm.isEmptyOrGetName()) return;
-      }
-
-    if(subName.val == REC_BNAM)
-      {
-	resultScript = esm.getHString();
-	if(esm.isEmptyOrGetName()) return;
-      }
-
-    questStatus = QS_None;
-    int skip = 1;
-
-    if     (subName.val == REC_QSTN) questStatus = QS_Name;
-    else if(subName.val == REC_QSTF) questStatus = QS_Finished;
-    else if(subName.val == REC_QSTR) questStatus = QS_Restart;
-    else if(subName.val == REC_DELE) {questStatus = QS_Deleted; skip = 4;}
-    else
-      esm.fail("Don't know what to do with " + subName.toString() + " in INFO " + id);
-
-    if(questStatus != QS_None)
-      esm.skip(skip);
-  }
+  void load(ESMReader &esm);
 };
 
 /*