diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb92bb6d..a581fc02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,8 @@ src/engine/platform/sound/ym2610/ymfm_adpcm.cpp
 src/engine/platform/sound/ym2610/ymfm_opn.cpp
 src/engine/platform/sound/ym2610/ymfm_ssg.cpp
 
+src/engine/platform/ym2610Interface.cpp
+
 src/engine/blip_buf.c
 src/engine/safeReader.cpp
 src/engine/engine.cpp
@@ -78,6 +80,7 @@ src/engine/platform/pce.cpp
 src/engine/platform/nes.cpp
 src/engine/platform/c64.cpp
 src/engine/platform/arcade.cpp
+src/engine/platform/ym2610.cpp
 src/engine/platform/dummy.cpp)
 
 #imgui/imgui.cpp
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 974a8816..240b9c12 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -14,6 +14,7 @@
 #include "platform/nes.h"
 #include "platform/c64.h"
 #include "platform/arcade.h"
+#include "platform/ym2610.h"
 #include "platform/dummy.h"
 #include <math.h>
 #include <zlib.h>
@@ -993,6 +994,9 @@ bool DivEngine::init(String outName) {
     case DIV_SYSTEM_ARCADE:
       dispatch=new DivPlatformArcade;
       break;
+    case DIV_SYSTEM_YM2610:
+      dispatch=new DivPlatformYM2610;
+      break;
     default:
       logW("this system is not supported yet! using dummy platform.\n");
       dispatch=new DivPlatformDummy;
diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp
new file mode 100644
index 00000000..b0a2c691
--- /dev/null
+++ b/src/engine/platform/ym2610.cpp
@@ -0,0 +1,351 @@
+#include "ym2610.h"
+#include "../engine.h"
+#include <string.h>
+#include <math.h>
+
+#include "ym2610shared.h"
+
+static unsigned char konOffs[4]={
+  1, 2, 5, 6
+};
+
+void DivPlatformYM2610::acquire(short* bufL, short* bufR, size_t start, size_t len) {
+  static int os[2];
+
+  for (size_t h=start; h<start+len; h++) {
+    os[0]=0; os[1]=0;
+    if (!writes.empty()) {
+      QueuedWrite& w=writes.front();
+      if (w.addrOrVal) {
+        fm->write(0x1+((w.addr>>8)<<1),w.val);
+        //printf("write: %x = %.2x\n",w.addr,w.val);
+        writes.pop();
+      } else {
+        fm->write(0x0+((w.addr>>8)<<1),w.addr);
+        w.addrOrVal=true;
+      }
+    }
+    
+    fm->generate(&fmout);
+
+    os[0]=fmout.data[0];
+    if (os[0]<-32768) os[0]=-32768;
+    if (os[0]>32767) os[0]=32767;
+
+    os[1]=fmout.data[1];
+    if (os[1]<-32768) os[1]=-32768;
+    if (os[1]>32767) os[1]=32767;
+  
+    bufL[h]=os[0];
+    bufR[h]=os[1];
+  }
+}
+
+void DivPlatformYM2610::tick() {
+  // FM
+  for (int i=0; i<4; i++) {
+    if (i==1 && extMode) continue;
+    if (chan[i].keyOn || chan[i].keyOff) {
+      writes.emplace(0x28,0x00|konOffs[i]);
+      chan[i].keyOff=false;
+    }
+  }
+
+  for (int i=0; i<512; i++) {
+    if (pendingWrites[i]!=oldWrites[i]) {
+      writes.emplace(i,pendingWrites[i]&0xff);
+      oldWrites[i]=pendingWrites[i];
+    }
+  }
+
+  for (int i=0; i<4; i++) {
+    if (i==1 && extMode) continue;
+    if (chan[i].freqChanged) {
+      chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE+chan[i].pitch))/ONE_SEMITONE;
+      int freqt=toFreq(chan[i].freq);
+      writes.emplace(chanOffs[i]+0xa4,freqt>>8);
+      writes.emplace(chanOffs[i]+0xa0,freqt&0xff);
+    }
+    if (chan[i].keyOn) {
+      writes.emplace(0x28,0xf0|konOffs[i]);
+      chan[i].keyOn=false;
+    }
+  }
+
+  // PSG
+}
+
+int DivPlatformYM2610::octave(int freq) {
+  if (freq>=82432) {
+    return 128;
+  } else if (freq>=41216) {
+    return 64;
+  } else if (freq>=20608) {
+    return 32;
+  } else if (freq>=10304) {
+    return 16;
+  } else if (freq>=5152) {
+    return 8;
+  } else if (freq>=2576) {
+    return 4;
+  } else if (freq>=1288) {
+    return 2;
+  } else {
+    return 1;
+  }
+  return 1;
+}
+
+int DivPlatformYM2610::toFreq(int freq) {
+  if (freq>=82432) {
+    return 0x3800|((freq>>7)&0x7ff);
+  } else if (freq>=41216) {
+    return 0x3000|((freq>>6)&0x7ff);
+  } else if (freq>=20608) {
+    return 0x2800|((freq>>5)&0x7ff);
+  } else if (freq>=10304) {
+    return 0x2000|((freq>>4)&0x7ff);
+  } else if (freq>=5152) {
+    return 0x1800|((freq>>3)&0x7ff);
+  } else if (freq>=2576) {
+    return 0x1000|((freq>>2)&0x7ff);
+  } else if (freq>=1288) {
+    return 0x800|((freq>>1)&0x7ff);
+  } else {
+    return freq&0x7ff;
+  }
+}
+
+int DivPlatformYM2610::dispatch(DivCommand c) {
+  switch (c.cmd) {
+    case DIV_CMD_NOTE_ON: {
+      DivInstrument* ins=parent->getIns(chan[c.chan].ins);
+      
+      for (int i=0; i<4; i++) {
+        unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
+        DivInstrumentFM::Operator op=ins->fm.op[i];
+        if (isOutput[ins->fm.alg][i]) {
+          if (!chan[c.chan].active || chan[c.chan].insChanged) {
+            rWrite(baseAddr+0x40,127-(((127-op.tl)*(chan[c.chan].vol&0x7f))/127));
+          }
+        } else {
+          if (chan[c.chan].insChanged) {
+            rWrite(baseAddr+0x40,op.tl);
+          }
+        }
+        if (chan[c.chan].insChanged) {
+          rWrite(baseAddr+0x30,(op.mult&15)|(dtTable[op.dt&7]<<4));
+          rWrite(baseAddr+0x50,(op.ar&31)|(op.rs<<6));
+          rWrite(baseAddr+0x60,(op.dr&31)|(op.am<<7));
+          rWrite(baseAddr+0x70,op.d2r&31);
+          rWrite(baseAddr+0x80,(op.rr&15)|(op.sl<<4));
+          rWrite(baseAddr+0x90,op.ssgEnv&15);
+        }
+      }
+      if (chan[c.chan].insChanged) {
+        rWrite(chanOffs[c.chan]+0xb0,(ins->fm.alg&7)|(ins->fm.fb<<3));
+        rWrite(chanOffs[c.chan]+0xb4,(chan[c.chan].pan<<6)|(ins->fm.fms&7)|((ins->fm.ams&3)<<4));
+      }
+      chan[c.chan].insChanged=false;
+
+      chan[c.chan].baseFreq=644.0f*pow(2.0f,((float)c.value/12.0f));
+      chan[c.chan].freqChanged=true;
+      chan[c.chan].keyOn=true;
+      chan[c.chan].active=true;
+      break;
+    }
+    case DIV_CMD_NOTE_OFF:
+      if (c.chan==5) {
+        dacSample=-1;
+      }
+      chan[c.chan].keyOff=true;
+      chan[c.chan].active=false;
+      break;
+    case DIV_CMD_VOLUME: {
+      chan[c.chan].vol=c.value;
+      DivInstrument* ins=parent->getIns(chan[c.chan].ins);
+      for (int i=0; i<4; i++) {
+        unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
+        DivInstrumentFM::Operator op=ins->fm.op[i];
+        if (isOutput[ins->fm.alg][i]) {
+          rWrite(baseAddr+0x40,127-(((127-op.tl)*(chan[c.chan].vol&0x7f))/127));
+        } else {
+          rWrite(baseAddr+0x40,op.tl);
+        }
+      }
+      break;
+    }
+    case DIV_CMD_GET_VOLUME: {
+      return chan[c.chan].vol;
+      break;
+    }
+    case DIV_CMD_INSTRUMENT:
+      if (chan[c.chan].ins!=c.value) {
+        chan[c.chan].insChanged=true;
+      }
+      chan[c.chan].ins=c.value;
+      break;
+    case DIV_CMD_PANNING: {
+      switch (c.value) {
+        case 0x01:
+          chan[c.chan].pan=1;
+          break;
+        case 0x10:
+          chan[c.chan].pan=2;
+          break;
+        default:
+          chan[c.chan].pan=3;
+          break;
+      }
+      DivInstrument* ins=parent->getIns(chan[c.chan].ins);
+      rWrite(chanOffs[c.chan]+0xb4,(chan[c.chan].pan<<6)|(ins->fm.fms&7)|((ins->fm.ams&3)<<4));
+      break;
+    }
+    case DIV_CMD_PITCH: {
+      chan[c.chan].pitch=c.value;
+      chan[c.chan].freqChanged=true;
+      break;
+    }
+    case DIV_CMD_NOTE_PORTA: {
+      int destFreq=644.0f*pow(2.0f,((float)c.value2/12.0f));
+      int newFreq;
+      bool return2=false;
+      if (destFreq>chan[c.chan].baseFreq) {
+        newFreq=chan[c.chan].baseFreq+c.value*octave(chan[c.chan].baseFreq);
+        if (newFreq>=destFreq) {
+          newFreq=destFreq;
+          return2=true;
+        }
+      } else {
+        newFreq=chan[c.chan].baseFreq-c.value*octave(chan[c.chan].baseFreq);
+        if (newFreq<=destFreq) {
+          newFreq=destFreq;
+          return2=true;
+        }
+      }
+      if (!chan[c.chan].portaPause) {
+        if (octave(chan[c.chan].baseFreq)!=octave(newFreq)) {
+          chan[c.chan].portaPause=true;
+          break;
+        }
+      }
+      chan[c.chan].baseFreq=newFreq;
+      chan[c.chan].portaPause=false;
+      chan[c.chan].freqChanged=true;
+      if (return2) return 2;
+      break;
+    }
+    case DIV_CMD_SAMPLE_MODE: {
+      if (c.chan==5) {
+        dacMode=c.value;
+        rWrite(0x2b,c.value<<7);
+      }
+      break;
+    }
+    case DIV_CMD_SAMPLE_BANK:
+      sampleBank=c.value;
+      if (sampleBank>(parent->song.sample.size()/12)) {
+        sampleBank=parent->song.sample.size()/12;
+      }
+      break;
+    case DIV_CMD_LEGATO: {
+      chan[c.chan].baseFreq=644.0f*pow(2.0f,((float)c.value/12.0f));
+      chan[c.chan].freqChanged=true;
+      break;
+    }
+    case DIV_CMD_FM_LFO: {
+      rWrite(0x22,(c.value&7)|((c.value>>4)<<3));
+      break;
+    }
+    case DIV_CMD_FM_MULT: {
+      unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
+      DivInstrument* ins=parent->getIns(chan[c.chan].ins);
+      DivInstrumentFM::Operator op=ins->fm.op[orderedOps[c.value]];
+      rWrite(baseAddr+0x30,(c.value2&15)|(dtTable[op.dt&7]<<4));
+      break;
+    }
+    case DIV_CMD_FM_TL: {
+      unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
+      DivInstrument* ins=parent->getIns(chan[c.chan].ins);
+      if (isOutput[ins->fm.alg][c.value]) {
+        rWrite(baseAddr+0x40,127-(((127-c.value2)*(chan[c.chan].vol&0x7f))/127));
+      } else {
+        rWrite(baseAddr+0x40,c.value2);
+      }
+      break;
+    }
+    case DIV_CMD_FM_AR: {
+      DivInstrument* ins=parent->getIns(chan[c.chan].ins);
+      if (c.value<0)  {
+        for (int i=0; i<4; i++) {
+          DivInstrumentFM::Operator op=ins->fm.op[i];
+          unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
+          rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
+        }
+      } else {
+        DivInstrumentFM::Operator op=ins->fm.op[orderedOps[c.value]];
+        unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
+        rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
+      }
+      
+      break;
+    }
+    case DIV_ALWAYS_SET_VOLUME:
+      return 0;
+      break;
+    case DIV_CMD_GET_VOLMAX:
+      if (c.chan>6) return 31;
+      if (c.chan>3) return 15;
+      return 127;
+      break;
+    case DIV_CMD_PRE_PORTA:
+      break;
+    case DIV_CMD_PRE_NOTE:
+      break;
+    default:
+      //printf("WARNING: unimplemented command %d\n",c.cmd);
+      break;
+  }
+  return 1;
+}
+
+bool DivPlatformYM2610::isStereo() {
+  return true;
+}
+
+bool DivPlatformYM2610::keyOffAffectsArp(int ch) {
+  return (ch>3);
+}
+
+int DivPlatformYM2610::init(DivEngine* p, int channels, int sugRate, bool pal) {
+  parent=p;
+  if (pal) {
+    rate=500000;
+  } else {
+    rate=500000;
+  }
+  fm=new ymfm::ym2610(iface);
+  fm->reset();
+  for (int i=0; i<10; i++) {
+    chan[i].vol=0x7f;
+  }
+
+  for (int i=0; i<512; i++) {
+    oldWrites[i]=-1;
+    pendingWrites[i]=-1;
+  }
+
+  lastBusy=60;
+  dacMode=0;
+  dacPeriod=0;
+  dacPos=0;
+  dacRate=0;
+  dacSample=-1;
+  sampleBank=0;
+
+  extMode=false;
+
+  // LFO
+  writes.emplace(0x22,0x08);
+  return 10;
+}
diff --git a/src/engine/platform/ym2610.h b/src/engine/platform/ym2610.h
new file mode 100644
index 00000000..6353ba35
--- /dev/null
+++ b/src/engine/platform/ym2610.h
@@ -0,0 +1,61 @@
+#ifndef _YM2610_H
+#define _YM2610_H
+#include "../dispatch.h"
+#include <queue>
+#include "sound/ym2610/ymfm_opn.h"
+
+class DivYM2610Interface: public ymfm::ymfm_interface {
+  public:
+    uint8_t ymfm_external_read(ymfm::access_class type, uint32_t address);
+    void ymfm_external_write(ymfm::access_class type, uint32_t address, uint8_t data);
+};
+
+class DivPlatformYM2610: public DivDispatch {
+  protected:
+    struct Channel {
+      unsigned char freqH, freqL;
+      int freq, baseFreq, pitch;
+      unsigned char ins;
+      signed char konCycles;
+      bool active, insChanged, freqChanged, keyOn, keyOff, portaPause;
+      int vol;
+      unsigned char pan;
+      Channel(): freqH(0), freqL(0), freq(0), baseFreq(0), pitch(0), ins(-1), active(false), insChanged(true), freqChanged(false), keyOn(false), keyOff(false), portaPause(false), vol(0), pan(3) {}
+    };
+    Channel chan[13];
+    struct QueuedWrite {
+      unsigned short addr;
+      unsigned char val;
+      bool addrOrVal;
+      QueuedWrite(unsigned short a, unsigned char v): addr(a), val(v), addrOrVal(false) {}
+    };
+    std::queue<QueuedWrite> writes;
+    ymfm::ym2610* fm;
+    ymfm::ym2610::output_data fmout;
+    DivYM2610Interface iface;
+    unsigned char lastBusy;
+  
+    bool dacMode;
+    int dacPeriod;
+    int dacRate;
+    int dacPos;
+    int dacSample;
+    int sampleBank;
+
+    bool extMode;
+  
+    short oldWrites[512];
+    short pendingWrites[512];
+
+    int octave(int freq);
+    int toFreq(int freq);
+  
+  public:
+    void acquire(short* bufL, short* bufR, size_t start, size_t len);
+    int dispatch(DivCommand c);
+    void tick();
+    bool isStereo();
+    bool keyOffAffectsArp(int ch);
+    int init(DivEngine* parent, int channels, int sugRate, bool pal);
+};
+#endif
diff --git a/src/engine/platform/ym2610Interface.cpp b/src/engine/platform/ym2610Interface.cpp
new file mode 100644
index 00000000..ff1822ad
--- /dev/null
+++ b/src/engine/platform/ym2610Interface.cpp
@@ -0,0 +1,10 @@
+#include "ym2610.h"
+
+uint8_t DivYM2610Interface::ymfm_external_read(ymfm::access_class type, uint32_t address) {
+  return 0;
+}
+
+void DivYM2610Interface::ymfm_external_write(ymfm::access_class type, uint32_t address, uint8_t data) {
+}
+
+
diff --git a/src/engine/platform/ym2610shared.h b/src/engine/platform/ym2610shared.h
new file mode 100644
index 00000000..baada39a
--- /dev/null
+++ b/src/engine/platform/ym2610shared.h
@@ -0,0 +1,26 @@
+static unsigned short chanOffs[4]={
+  0x01, 0x02, 0x101, 0x102
+};
+static unsigned short opOffs[4]={
+  0x00, 0x04, 0x08, 0x0c
+};
+static bool isOutput[8][4]={
+  // 1     3     2    4
+  {false,false,false,true},
+  {false,false,false,true},
+  {false,false,false,true},
+  {false,false,false,true},
+  {false,false,true ,true},
+  {false,true ,true ,true},
+  {false,true ,true ,true},
+  {true ,true ,true ,true},
+};
+static unsigned char dtTable[8]={
+  7,6,5,0,1,2,3,0
+};
+
+static int orderedOps[4]={
+  0,2,1,3
+};
+
+#define rWrite(a,v) pendingWrites[a]=v;