diff --git a/pykd/disasm.h b/pykd/disasm.h
new file mode 100644
index 0000000..5c54503
--- /dev/null
+++ b/pykd/disasm.h
@@ -0,0 +1,62 @@
+#pragma once
+
+#include "dbgmem.h"
+
+/////////////////////////////////////////////////////////////////////////////////
+
+class disasm {
+
+public:
+
+    disasm( ULONG64 offset = 0);
+
+    std::string  disassemble() {
+        std::string  s = m_disasm;
+        m_currentOffset += m_length;
+        doDisasm();
+        return s;
+    }
+
+    std::string  reset() {
+
+        m_currentOffset = m_beginOffset;
+        doDisasm();
+        return m_disasm;
+    }
+
+    std::string
+    assembly( const std::string &instr );
+
+    std::string    instruction() const {
+        return m_disasm;
+    }
+
+    ULONG64 begin() const {
+        return m_beginOffset;
+    }
+
+    ULONG64 current() const {
+        return m_currentOffset;
+    }
+
+    ULONG length() const {
+        return m_length;
+    }
+
+    ULONG64 ea() const {
+        return m_ea;
+    }
+
+private:
+
+    void doDisasm();
+
+    ULONG64         m_beginOffset;
+    ULONG64         m_currentOffset;
+    ULONG64         m_ea;
+    ULONG           m_length;
+
+    std::string     m_disasm;
+};
+
+/////////////////////////////////////////////////////////////////////////////////