diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 9cfbc18d9..b65727572 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -3248,6 +3248,20 @@ bool DivEngine::moveSampleDown(int which) {
   return true;
 }
 
+bool DivEngine::swapInstruments(int a, int b) {
+  if (a<0 || a>=(int)song.ins.size() || b<0 || b>=(int)song.ins.size()) return false;
+  BUSY_BEGIN;
+  DivInstrument* temp=song.ins[a];
+  saveLock.lock();
+  song.ins[a]=song.ins[b];
+  song.ins[b]=temp;
+  moveAsset(song.insDir,a,b);
+  exchangeIns(a,b);
+  saveLock.unlock();
+  BUSY_END;
+  return true;
+}
+
 void DivEngine::autoPatchbay() {
   song.patchbay.clear();
   for (unsigned int i=0; i<song.systemLen; i++) {
diff --git a/src/engine/engine.h b/src/engine/engine.h
index a3289e042..9fd1d2962 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -1107,6 +1107,9 @@ class DivEngine {
     bool moveWaveDown(int which);
     bool moveSampleDown(int which);
 
+    // swap things
+    bool swapInstruments(int a, int b);
+
     // automatic patchbay
     void autoPatchbay();
     void autoPatchbayP();
diff --git a/src/gui/dataList.cpp b/src/gui/dataList.cpp
index ce655ea2b..51c70b2b5 100644
--- a/src/gui/dataList.cpp
+++ b/src/gui/dataList.cpp
@@ -138,8 +138,10 @@ void FurnaceGUI::insListItem(int i, int dir, int asset) {
         const ImGuiPayload* payload=ImGui::AcceptDragDropPayload("FUR_INS");
         if (payload!=NULL) {
           int targetIns=i;
-          printf("From %d to %d\n",insToMove,targetIns);
-          // TODO: actually swap the instruments
+          if (insToMove!=targetIns && e->swapInstruments(insToMove,targetIns)) {
+            MARK_MODIFIED;
+            curIns=targetIns;
+          }
           insToMove=-1;
           ImGui::EndDragDropTarget();
         }