diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 058be1d1..23d96cd1 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -6472,8 +6472,11 @@ FurnaceGUI::FurnaceGUI():
   samplePreviewOn(false),
   samplePreviewKey((SDL_Scancode)0),
   samplePreviewNote(0),
-  arpMacroScroll(-12),
-  pitchMacroScroll(-80),
+  sampleMapSelStart(-1),
+  sampleMapSelEnd(-1),
+  sampleMapDigit(0),
+  sampleMapColumn(0),
+  sampleMapFocused(false),
   macroDragStart(0,0),
   macroDragAreaSize(0,0),
   macroDragCTarget(NULL),
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 87fb7970..4dcb78ee 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1679,8 +1679,11 @@ class FurnaceGUI {
   std::vector<TouchPoint> pressedPoints;
   std::vector<TouchPoint> releasedPoints;
 
-  int arpMacroScroll;
-  int pitchMacroScroll;
+  int sampleMapSelStart;
+  int sampleMapSelEnd;
+  int sampleMapDigit;
+  int sampleMapColumn;
+  bool sampleMapFocused;
 
   ImVec2 macroDragStart;
   ImVec2 macroDragAreaSize;
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index f2d97ac0..b6fcd7bc 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -4425,6 +4425,7 @@ void FurnaceGUI::drawInsEdit() {
                   ImGui::TableNextColumn();
                   ImGui::Text("%s",noteNames[60+i]);
                   ImGui::TableNextColumn();
+                  // TODO: new style sample map
                   if (sampleMap.map<0 || sampleMap.map>=e->song.sampleLen) {
                     sName="-- empty --";
                     sampleMap.map=-1;