diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0b122a53..715450e2 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -5729,6 +5729,8 @@ FurnaceGUI::FurnaceGUI():
   zsmExportTickRate(60),
   macroPointSize(16),
   waveEditStyle(0),
+  selectedPortSet(0x1fff),
+  selectedSubPort(-1),
   displayInsTypeListMakeInsSample(-1),
   mobileEditPage(0),
   mobileMenuPos(0.0f),
diff --git a/src/gui/gui.h b/src/gui/gui.h
index dddaf923..86e02a27 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -270,6 +270,9 @@ enum FurnaceGUIColors {
   GUI_COLOR_CLOCK_BEAT_LOW,
   GUI_COLOR_CLOCK_BEAT_HIGH,
 
+  GUI_COLOR_PATCHBAY_PORTSET,
+  GUI_COLOR_PATCHBAY_PORT,
+
   GUI_COLOR_LOGLEVEL_ERROR,
   GUI_COLOR_LOGLEVEL_WARNING,
   GUI_COLOR_LOGLEVEL_INFO,
@@ -1109,6 +1112,11 @@ class FurnaceGUI {
   int zsmExportTickRate;
   int macroPointSize;
   int waveEditStyle;
+  // 0xxx: output
+  // 1xxx: input
+  unsigned int selectedPortSet;
+  // any value not between 0 and 15 are "none"
+  int selectedSubPort;
   int displayInsTypeListMakeInsSample;
   int mobileEditPage;
   float mobileMenuPos, autoButtonSize, mobileEditAnim;
@@ -1760,6 +1768,9 @@ class FurnaceGUI {
   // inverted checkbox
   bool InvCheckbox(const char* label, bool* value);
 
+  // mixer stuff
+  bool portSet(String label, unsigned int portSetID, int ins, int outs);
+
   void updateWindowTitle();
   void autoDetectSystem();
   void prepareLayout();
diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp
index f9092179..5ddd7342 100644
--- a/src/gui/guiConst.cpp
+++ b/src/gui/guiConst.cpp
@@ -896,6 +896,9 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
   D(GUI_COLOR_CLOCK_BEAT_LOW,"",ImVec4(0.1f,0.13f,0.25f,1.0f)),
   D(GUI_COLOR_CLOCK_BEAT_HIGH,"",ImVec4(0.5f,0.8f,1.0f,1.0f)),
 
+  D(GUI_COLOR_PATCHBAY_PORTSET,"",ImVec4(0.25f,0.25f,0.25f,1.0f)),
+  D(GUI_COLOR_PATCHBAY_PORT,"",ImVec4(0.5f,0.6f,0.6f,1.0f)),
+
   D(GUI_COLOR_LOGLEVEL_ERROR,"",ImVec4(1.0f,0.2f,0.2f,1.0f)),
   D(GUI_COLOR_LOGLEVEL_WARNING,"",ImVec4(1.0f,1.0f,0.2f,1.0f)),
   D(GUI_COLOR_LOGLEVEL_INFO,"",ImVec4(0.4f,1.0f,0.4f,1.0f)),
diff --git a/src/gui/mixer.cpp b/src/gui/mixer.cpp
index d234e820..b7fb7d19 100644
--- a/src/gui/mixer.cpp
+++ b/src/gui/mixer.cpp
@@ -19,6 +19,87 @@
 
 #include "gui.h"
 #include "intConst.h"
+#include <fmt/printf.h>
+#include "imgui_internal.h"
+
+bool FurnaceGUI::portSet(String label, unsigned int portSetID, int ins, int outs) {
+  String portID=fmt::sprintf("portSet%.4x",portSetID);
+
+  ImDrawList* dl=ImGui::GetWindowDrawList();
+  ImGuiWindow* window=ImGui::GetCurrentWindow();
+  ImGuiStyle& style=ImGui::GetStyle();
+
+  ImVec2 labelSize=ImGui::CalcTextSize(label.c_str());
+
+  ImVec2 size=labelSize;
+
+  // pad
+  size.x+=style.FramePadding.x*2.0f;
+  size.y+=style.FramePadding.y*2.0f;
+
+  // space for ports
+  size.y+=MAX(ins,outs)*labelSize.y+style.FramePadding.y*2.0f+style.ItemSpacing.y;
+
+  ImVec4 portSetBorderColor=uiColors[GUI_COLOR_PATCHBAY_PORTSET];
+  ImVec4 portSetColor=ImVec4(
+    portSetBorderColor.x*0.75f,
+    portSetBorderColor.y*0.75f,
+    portSetBorderColor.z*0.75f,
+    portSetBorderColor.w
+  );
+
+  ImVec4 portBorderColor=uiColors[GUI_COLOR_PATCHBAY_PORT];
+  ImVec4 portColor=ImVec4(
+    portBorderColor.x*0.75f,
+    portBorderColor.y*0.75f,
+    portBorderColor.z*0.75f,
+    portBorderColor.w
+  );
+
+  ImVec2 minArea=window->DC.CursorPos;
+  ImVec2 maxArea=ImVec2(
+    minArea.x+size.x,
+    minArea.y+size.y
+  );
+  ImRect rect=ImRect(minArea,maxArea);
+
+  ImVec2 textPos=ImVec2(
+    minArea.x+style.FramePadding.x,
+    minArea.y+style.FramePadding.y
+  );
+
+  ImGui::ItemSize(size,style.FramePadding.y);
+  if (ImGui::ItemAdd(rect,ImGui::GetID(portID.c_str()))) {
+    // label
+    dl->AddRectFilled(minArea,maxArea,ImGui::GetColorU32(portSetColor),0.0f);
+    dl->AddRect(minArea,maxArea,ImGui::GetColorU32(portSetBorderColor),0.0f,dpiScale);
+    dl->AddText(textPos,ImGui::GetColorU32(uiColors[GUI_COLOR_TEXT]),label.c_str());
+
+    // ports
+    for (int i=0; i<outs; i++) {
+      String portLabel=fmt::sprintf("%d",i+1);
+      ImVec2 portLabelSize=ImGui::CalcTextSize(portLabel.c_str());
+
+      ImVec2 portMin=ImVec2(
+        maxArea.x-portLabelSize.x-style.FramePadding.x*2,
+        minArea.y+style.FramePadding.y+labelSize.y+(style.ItemSpacing.y+portLabelSize.y+style.FramePadding.y*2)*i
+      );
+      ImVec2 portMax=ImVec2(
+        maxArea.x,
+        minArea.y+style.FramePadding.y+labelSize.y+portLabelSize.y+style.FramePadding.y*2+(style.ItemSpacing.y+portLabelSize.y+style.FramePadding.y*2)*i
+      );
+      ImVec2 portLabelPos=portMin;
+      portLabelPos.x+=style.FramePadding.x;
+      portLabelPos.y+=style.FramePadding.y;
+
+      dl->AddRectFilled(portMin,portMax,ImGui::GetColorU32(portColor),0.0f);
+      dl->AddRect(portMin,portMax,ImGui::GetColorU32(portBorderColor),0.0f,dpiScale);
+      dl->AddText(portLabelPos,ImGui::GetColorU32(uiColors[GUI_COLOR_TEXT]),portLabel.c_str());
+    }
+  }
+
+  return false;
+}
 
 void FurnaceGUI::drawMixer() {
   if (nextWindow==GUI_WINDOW_MIXER) {
@@ -36,48 +117,79 @@ void FurnaceGUI::drawMixer() {
     ImGui::SetNextWindowSizeConstraints(ImVec2(400.0f*dpiScale,200.0f*dpiScale),ImVec2(canvasW,canvasH));
   }
   if (ImGui::Begin("Mixer",&mixerOpen,globalWinFlags|(settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking))) {
-    char id[32];
     if (ImGui::SliderFloat("Master Volume",&e->song.masterVol,0,3,"%.2fx")) {
       if (e->song.masterVol<0) e->song.masterVol=0;
       if (e->song.masterVol>3) e->song.masterVol=3;
       MARK_MODIFIED;
     } rightClickable
-    for (int i=0; i<e->song.systemLen; i++) {
-      snprintf(id,31,"MixS%d",i);
-      bool doInvert=e->song.systemVol[i]<0;
-      float vol=fabs(e->song.systemVol[i]);
-      ImGui::PushID(id);
-      ImGui::Text("%d. %s",i+1,getSystemName(e->song.system[i]));
-      ImGui::SameLine(ImGui::GetWindowWidth()-(82.0f*dpiScale));
-      if (ImGui::Checkbox("Invert",&doInvert)) {
-        e->song.systemVol[i]=-e->song.systemVol[i];
-        MARK_MODIFIED;
-      }
-      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-      if (CWSliderFloat("Volume",&vol,0,2)) {
-        if (doInvert) {
-          if (vol<0.0001) vol=0.0001;
-        }
-        if (vol<0) vol=0;
-        if (vol>10) vol=10;
-        e->song.systemVol[i]=(doInvert)?-vol:vol;
-        MARK_MODIFIED;
-      } rightClickable
-      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-      if (CWSliderFloat("Panning",&e->song.systemPan[i],-1.0f,1.0f)) {
-        if (e->song.systemPan[i]<-1.0f) e->song.systemPan[i]=-1.0f;
-        if (e->song.systemPan[i]>1.0f) e->song.systemPan[i]=1.0f;
-        MARK_MODIFIED;
-      } rightClickable
-      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-      if (CWSliderFloat("Front/Rear",&e->song.systemPanFR[i],-1.0f,1.0f)) {
-        if (e->song.systemPanFR[i]<-1.0f) e->song.systemPanFR[i]=-1.0f;
-        if (e->song.systemPanFR[i]>1.0f) e->song.systemPanFR[i]=1.0f;
-        MARK_MODIFIED;
-      } rightClickable
+    if (selectedPortSet<e->song.systemLen) {
+      if (ImGui::BeginTable("CurPortSet",2)) {
+        ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthStretch);
+        ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed);
 
-      ImGui::PopID();
+        bool doInvert=e->song.systemVol[selectedPortSet]<0;
+        float vol=fabs(e->song.systemVol[selectedPortSet]);
+
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::Text("%d. %s",selectedPortSet+1,getSystemName(e->song.system[selectedPortSet]));
+        ImGui::TableNextColumn();
+        if (ImGui::Checkbox("Invert",&doInvert)) {
+          e->song.systemVol[selectedPortSet]=-e->song.systemVol[selectedPortSet];
+          MARK_MODIFIED;
+        }
+
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (CWSliderFloat("##Volume",&vol,0,2)) {
+          if (doInvert) {
+            if (vol<0.0001) vol=0.0001;
+          }
+          if (vol<0) vol=0;
+          if (vol>10) vol=10;
+          e->song.systemVol[selectedPortSet]=(doInvert)?-vol:vol;
+          MARK_MODIFIED;
+        } rightClickable
+        ImGui::TableNextColumn();
+        ImGui::Text("Volume");
+
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (CWSliderFloat("##Panning",&e->song.systemPan[selectedPortSet],-1.0f,1.0f)) {
+          if (e->song.systemPan[selectedPortSet]<-1.0f) e->song.systemPan[selectedPortSet]=-1.0f;
+          if (e->song.systemPan[selectedPortSet]>1.0f) e->song.systemPan[selectedPortSet]=1.0f;
+          MARK_MODIFIED;
+        } rightClickable
+        ImGui::TableNextColumn();
+        ImGui::Text("Panning");
+
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (CWSliderFloat("##FrontRear",&e->song.systemPanFR[selectedPortSet],-1.0f,1.0f)) {
+          if (e->song.systemPanFR[selectedPortSet]<-1.0f) e->song.systemPanFR[selectedPortSet]=-1.0f;
+          if (e->song.systemPanFR[selectedPortSet]>1.0f) e->song.systemPanFR[selectedPortSet]=1.0f;
+          MARK_MODIFIED;
+        } rightClickable
+        ImGui::TableNextColumn();
+        ImGui::Text("Front/Rear");
+
+        ImGui::EndTable();
+      }
     }
+    if (ImGui::BeginChild("Patchbay",ImVec2(0,0),true)) {
+      ImGui::Text("The patchbay goes here...");
+      for (int i=0; i<e->song.systemLen; i++) {
+        DivDispatch* dispatch=e->getDispatch(i);
+        if (dispatch==NULL) continue;
+        if (portSet(fmt::sprintf("%d. %s",i+1,getSystemName(e->song.system[i])),i,0,dispatch->getOutputCount())) {
+          selectedPortSet=i;
+        }
+      }
+    }
+    ImGui::EndChild();
   }
   if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_MIXER;
   ImGui::End();