diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..73de3c1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+build
+*.prlgunit
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f865f3d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "eurorack"]
+	path = eurorack
+	url = https://github.com/peterall/eurorack.git
+[submodule "logue-sdk"]
+	path = logue-sdk
+	url = https://github.com/korginc/logue-sdk.git
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..377f43a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+TOPTARGETS := all clean
+
+OSCILLATORS := $(wildcard *mk)
+
+$(TOPTARGETS): $(OSCILLATORS)
+$(OSCILLATORS):
+	@rm -fR .dep ./build
+	@$(MAKE) -f $@ $(MAKECMDGOALS)
+
+.PHONY: $(TOPTARGETS) $(OSCILLATORS)
diff --git a/eurorack b/eurorack
new file mode 160000
index 0000000..1cf95b2
--- /dev/null
+++ b/eurorack
@@ -0,0 +1 @@
+Subproject commit 1cf95b2f26edd6cd9f89d038c2746f958abefae4
diff --git a/logue-sdk b/logue-sdk
new file mode 160000
index 0000000..3b34875
--- /dev/null
+++ b/logue-sdk
@@ -0,0 +1 @@
+Subproject commit 3b34875aaff41752c9e34439fce6d6a32dac2fa0
diff --git a/macro-oscillator2.cc b/macro-oscillator2.cc
new file mode 100644
index 0000000..5cb5237
--- /dev/null
+++ b/macro-oscillator2.cc
@@ -0,0 +1,165 @@
+#include "userosc.h"
+#include "stmlib/dsp/dsp.h"
+#include "plaits/dsp/dsp.h"
+
+#ifdef OSC_VA
+#include "plaits/dsp/engine/virtual_analog_engine.h"
+plaits::VirtualAnalogEngine engine;
+float out_gain = 0.8f, aux_gain = 0.8f;
+#endif
+
+#ifdef OSC_WS
+#include "plaits/dsp/engine/waveshaping_engine.h"
+plaits::WaveshapingEngine engine;
+float out_gain = 0.7f, aux_gain = 0.6f;
+#endif
+
+#ifdef OSC_FM
+#include "plaits/dsp/engine/fm_engine.h"
+plaits::FMEngine engine;
+float out_gain = 0.6f, aux_gain = 0.6f;
+#endif
+
+#ifdef OSC_GR
+#include "plaits/dsp/engine/grain_engine.h"
+plaits::GrainEngine engine;
+float out_gain = 0.7f, aux_gain = 0.6f;
+#endif
+
+#ifdef OSC_AD
+#include "plaits/dsp/engine/additive_engine.h"
+plaits::AdditiveEngine engine;
+float out_gain = 0.8f, aux_gain = 0.8f;
+#endif
+
+plaits::EngineParameters parameters = {
+  .trigger = plaits::TRIGGER_UNPATCHED, 
+  .note = 0,
+  .timbre = 0,
+  .morph = 0,
+  .harmonics = 0,
+  .accent = 0
+};
+
+float harmonics = 0, 
+  timbre = 0, 
+  morph = 0, 
+  auxmix = 0,
+  shape = 0,
+  shiftshape = 0;
+
+int param_mode = 0;
+
+void OSC_INIT(uint32_t platform, uint32_t api)
+{
+  static uint8_t engine_buffer[plaits::kMaxBlockSize*sizeof(float)];
+  stmlib::BufferAllocator allocator;
+  allocator.Init(engine_buffer, sizeof(engine_buffer));
+  engine.Init(&allocator);
+}
+
+void OSC_CYCLE(const user_osc_param_t *const params,
+               int32_t *yn,
+               const uint32_t frames)
+{
+  static float out[plaits::kMaxBlockSize], aux[plaits::kMaxBlockSize];
+  static bool enveloped;
+
+  parameters.note = ((float)(params->pitch >> 8)) + ((params->pitch & 0xFF) * k_note_mod_fscale);
+
+  float shape_lfo = clip01f(shape + q31_to_f32(params->shape_lfo));
+
+  switch(param_mode) {
+  case 0:
+    parameters.timbre = shape_lfo;
+    parameters.morph = shiftshape;
+    parameters.harmonics = harmonics;
+    break;
+  case 1:
+    parameters.timbre = shape_lfo;
+    parameters.morph = morph;
+    parameters.harmonics = shiftshape;
+    break;
+  case 2:
+    parameters.timbre = shiftshape;
+    parameters.morph = shape_lfo;
+    parameters.harmonics = harmonics;
+    break;
+  case 3:
+    parameters.timbre = timbre;
+    parameters.morph = shape_lfo;
+    parameters.harmonics = shiftshape;
+    break;
+  case 4:
+    parameters.timbre = shiftshape;
+    parameters.morph = morph;
+    parameters.harmonics = shape_lfo;
+    break;
+  case 5:
+    parameters.timbre = timbre;
+    parameters.morph = shiftshape;
+    parameters.harmonics = shape_lfo;
+    break;
+  }
+
+  engine.Render(parameters, out, aux, (size_t)frames, &enveloped);
+
+  for(size_t i=0;i<frames;i++) {
+    float o = out[i] * out_gain, a = aux[i] * aux_gain;
+    yn[i] = f32_to_q31(stmlib::Crossfade(o, a, auxmix));
+  }
+}
+
+void OSC_NOTEON(const user_osc_param_t *const params)
+{
+  (void)params;
+}
+
+void OSC_NOTEOFF(const user_osc_param_t *const params)
+{
+  (void)params;
+}
+
+inline float percentage_to_f32(int16_t value) {
+  return clip01f(value * 0.01f);
+}
+
+void OSC_PARAM(uint16_t index, uint16_t value)
+{
+  switch (index)
+  {
+  case k_osc_param_id1:
+    harmonics = percentage_to_f32(value);
+    break;
+
+  case k_osc_param_id2:
+    timbre = percentage_to_f32(value);
+    break;
+
+  case k_osc_param_id3:
+    morph = percentage_to_f32(value);
+    break;
+
+  case k_osc_param_id4:
+    auxmix = percentage_to_f32(value);
+    break;
+
+  case k_osc_param_id5:
+    param_mode = value % 6;
+    break;
+
+  case k_osc_param_id6:
+    break;
+
+  case k_osc_param_shape:
+    shape = clip01f(param_val_to_f32(value));
+    break;
+
+  case k_osc_param_shiftshape:
+    shiftshape = clip01f(param_val_to_f32(value));
+    break;
+
+  default:
+    break;
+  }
+}
diff --git a/makefile.inc b/makefile.inc
new file mode 100644
index 0000000..6135234
--- /dev/null
+++ b/makefile.inc
@@ -0,0 +1,239 @@
+# #############################################################################
+# Prologue Oscillator Makefile
+# #############################################################################
+
+ifeq ($(OS),Windows_NT)
+ifeq ($(MSYSTEM), MSYS)
+    detected_OS := $(shell uname -s)
+else
+    detected_OS := Windows
+endif
+else
+    detected_OS := $(shell uname -s)
+endif
+
+PROJECT = mo2_$(OSCILLATOR)
+OSCILLATOR_UC = $(shell echo $(OSCILLATOR) | tr a-z A-Z)
+
+PLATFORMDIR = logue-sdk/platform/prologue
+PROJECTDIR = .
+TOOLSDIR = $(PLATFORMDIR)/../../tools
+EXTDIR = $(PLATFORMDIR)/../ext
+TEMPLATEDIR = $(PLATFORMDIR)/osc
+
+CMSISDIR = $(EXTDIR)/CMSIS/CMSIS
+
+# #############################################################################
+# configure archive utility
+# #############################################################################
+
+ZIP = /usr/bin/zip
+ZIP_ARGS = -r -m -q
+
+ifeq ($(OS),Windows_NT)
+ifneq ($(MSYSTEM), MSYS)
+  ZIP = $(TOOLSDIR)/zip/bin/zip
+endif
+endif
+
+# #############################################################################
+# Include project specific definition
+# #############################################################################
+
+#include ./project.mk
+
+# #############################################################################
+# configure cross compilation
+# #############################################################################
+
+MCU = cortex-m4
+
+GCC_TARGET = arm-none-eabi-
+GCC_BIN_PATH = $(TOOLSDIR)/gcc/gcc-arm-none-eabi-5_4-2016q3/bin
+
+CC   = $(GCC_BIN_PATH)/$(GCC_TARGET)gcc
+CXXC = $(GCC_BIN_PATH)/$(GCC_TARGET)g++
+LD   = $(GCC_BIN_PATH)/$(GCC_TARGET)gcc
+#LD  = $(GCC_BIN_PATH)/$(GCC_TARGET)g++
+CP   = $(GCC_BIN_PATH)/$(GCC_TARGET)objcopy
+AS   = $(GCC_BIN_PATH)/$(GCC_TARGET)gcc -x assembler-with-cpp
+AR   = $(GCC_BIN_PATH)/$(GCC_TARGET)ar
+OD   = $(GCC_BIN_PATH)/$(GCC_TARGET)objdump
+SZ   = $(GCC_BIN_PATH)/$(GCC_TARGET)size
+
+HEX  = $(CP) -O ihex
+BIN  = $(CP) -O binary
+
+LDDIR = $(TEMPLATEDIR)/ld
+RULESPATH = $(LDDIR)
+LDSCRIPT = $(LDDIR)/userosc.ld
+DLIBS = -lm
+
+DADEFS = -DSTM32F401xC -DCORTEX_USE_FPU=TRUE -DARM_MATH_CM4
+DDEFS = -DSTM32F401xC -DCORTEX_USE_FPU=TRUE -DARM_MATH_CM4 -D__FPU_PRESENT -D_USE_MATH_DEFINES -DOSC_$(OSCILLATOR_UC)
+
+COPT = -std=c11 -mstructure-size-boundary=8
+CXXOPT = -std=c++11 -fno-rtti -fno-exceptions -fno-non-call-exceptions -fno-use-cxa-atexit -ffunction-sections -fdata-sections -funroll-loops
+
+LDOPT = -Xlinker --just-symbols=$(LDDIR)/osc_api.syms -Wl,--gc-sections
+
+CWARN = -W -Wall -Wextra
+CXXWARN =
+
+FPU_OPTS = -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant -fcheck-new 
+
+OPT = -g -O3 -mlittle-endian
+OPT += $(FPU_OPTS)
+#OPT += -flto
+
+TOPT = -mthumb -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -DTHUMB_PRESENT
+
+
+# #############################################################################
+# set targets and directories
+# #############################################################################
+
+PKGDIR = $(PROJECT)
+PKGARCH = $(PROJECT).prlgunit
+MANIFEST = manifest.json
+PAYLOAD = payload.bin
+BUILDDIR = $(PROJECTDIR)/build
+OBJDIR = $(BUILDDIR)/obj
+LSTDIR = $(BUILDDIR)/lst
+
+ASMSRC = $(UASMSRC)
+
+ASMXSRC = $(UASMXSRC)
+
+CSRC = $(TEMPLATEDIR)/tpl/_unit.c $(UCSRC)
+
+CXXSRC = $(UCXXSRC)
+
+vpath %.s $(sort $(dir $(ASMSRC)))
+vpath %.S $(sort $(dir $(ASMXSRC)))
+vpath %.c $(sort $(dir $(CSRC)))
+vpath %.cc $(sort $(dir $(CXXSRC)))
+
+ASMOBJS := $(addprefix $(OBJDIR)/, $(notdir $(ASMSRC:.s=.o)))
+ASMXOBJS := $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o)))
+COBJS := $(addprefix $(OBJDIR)/, $(notdir $(CSRC:.c=.o)))
+CXXOBJS := $(addprefix $(OBJDIR)/, $(notdir $(CXXSRC:.cc=.o)))
+
+OBJS := $(ASMXOBJS) $(ASMOBJS) $(COBJS) $(CXXOBJS)
+
+DINCDIR = $(TEMPLATEDIR)/inc \
+	  $(TEMPLATEDIR)/inc/api \
+	  $(PROJECTDIR)/eurorack \
+          $(PLATFORMDIR)/inc \
+	  $(PLATFORMDIR)/inc/dsp \
+	  $(PLATFORMDIR)/inc/utils \
+          $(CMSISDIR)/Include
+
+INCDIR := $(patsubst %,-I%,$(DINCDIR) $(UINCDIR))
+
+DEFS := $(DDEFS) $(UDEFS)
+ADEFS := $(DADEFS) $(UADEFS)
+
+LIBS := $(DLIBS) $(ULIBS)
+
+LIBDIR := $(patsubst %,-I%,$(DLIBDIR) $(ULIBDIR))
+
+
+# #############################################################################
+# compiler flags
+# #############################################################################
+
+MCFLAGS   := -mcpu=$(MCU)
+ODFLAGS	  = -x --syms
+ASFLAGS   = $(MCFLAGS) -g $(TOPT) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
+ASXFLAGS  = $(MCFLAGS) -g $(TOPT) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)
+CFLAGS    = $(MCFLAGS) $(TOPT) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
+CXXFLAGS  = $(MCFLAGS) $(TOPT) $(OPT) $(CXXOPT) $(CXXWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cc=.lst)) $(DEFS)
+LDFLAGS   = $(MCFLAGS) $(TOPT) $(OPT) -nostartfiles $(LIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH),--script=$(LDSCRIPT) $(LDOPT)
+
+OUTFILES := $(BUILDDIR)/$(PROJECT).elf \
+	    $(BUILDDIR)/$(PROJECT).hex \
+	    $(BUILDDIR)/$(PROJECT).bin \
+	    $(BUILDDIR)/$(PROJECT).dmp \
+	    $(BUILDDIR)/$(PROJECT).list
+
+###############################################################################
+# targets
+###############################################################################
+
+all: PRE_ALL $(OBJS) $(OUTFILES) POST_ALL
+
+PRE_ALL:
+
+POST_ALL: package
+
+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)
+
+$(BUILDDIR):
+	@echo Compiler Options
+	@echo $(CC) -c $(CFLAGS) -I. $(INCDIR)
+	@echo
+	@mkdir -p $(BUILDDIR)
+
+$(OBJDIR):
+	@mkdir -p $(OBJDIR)
+
+$(LSTDIR):
+	@mkdir -p $(LSTDIR)
+
+$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile
+	@echo Assembling $(<F)
+	@$(AS) -c $(ASFLAGS) -I. $(INCDIR) $< -o $@
+
+$(ASMXOBJS) : $(OBJDIR)/%.o : %.S Makefile
+	@echo Assembling $(<F)
+	@$(CC) -c $(ASXFLAGS) -I. $(INCDIR) $< -o $@
+
+$(COBJS) : $(OBJDIR)/%.o : %.c Makefile
+	@echo Compiling $(<F)
+	@$(CC) -c $(CFLAGS) -I. $(INCDIR) $< -o $@
+
+$(CXXOBJS) : $(OBJDIR)/%.o : %.cc Makefile
+	@echo Compiling $(<F)
+	@$(CXXC) -c $(CXXFLAGS) -I. $(INCDIR) $< -o $@
+
+$(BUILDDIR)/%.elf: $(OBJS) $(LDSCRIPT)
+	@echo Linking $@
+	@$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+
+%.hex: %.elf
+	@echo Creating $@
+	@$(HEX) $< $@
+
+%.bin: %.elf
+	@echo Creating $@
+	@$(BIN) $< $@
+
+%.dmp: %.elf
+	@echo Creating $@
+	@$(OD) $(ODFLAGS) $< > $@
+	@echo
+	@$(SZ) $<
+	@echo
+
+%.list: %.elf
+	@echo Creating $@
+	@$(OD) -S $< > $@
+
+clean:
+	@echo Cleaning
+	-rm -fR .dep $(BUILDDIR) $(PKGARCH)
+	@echo
+	@echo Done
+
+package:
+	@echo Packaging to ./$(PKGARCH)
+	@mkdir -p $(PKGDIR)
+	@cp -a $(MANIFEST) $(PKGDIR)/
+	@sed -ie 's/%OSCILLATOR%/$(OSCILLATOR)/g' $(PKGDIR)/$(MANIFEST)
+	@rm $(PKGDIR)/$(MANIFEST)e
+	@cp -a $(BUILDDIR)/$(PROJECT).bin $(PKGDIR)/$(PAYLOAD)
+	@$(ZIP) $(ZIP_ARGS) $(PROJECT).zip $(PKGDIR)
+	@mv $(PROJECT).zip $(PKGARCH)
+	@echo
+	@echo Done
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..417f69e
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,20 @@
+{
+    "header" : 
+    {
+        "platform" : "prologue",
+        "module" : "osc",
+        "api" : "1.0-0",
+        "dev_id" : 0,
+        "prg_id" : 0,
+        "version" : "1.0-0",
+        "name" : "mo2 %OSCILLATOR%",
+        "num_param" : 5,
+        "params" : [
+            ["Harmonics",  0, 100,  "%"],
+            ["Timbre",     0, 100,  "%"],
+            ["Morph",      0, 100,  "%"],
+            ["Out/Aux",    0, 100,  "%"],
+            ["ParamMode",  0,   5,   ""]        
+        ]
+    }
+}
diff --git a/osc_ad.mk b/osc_ad.mk
new file mode 100644
index 0000000..83ff624
--- /dev/null
+++ b/osc_ad.mk
@@ -0,0 +1,8 @@
+OSCILLATOR = ad
+
+UCXXSRC = macro-oscillator2.cc \
+	eurorack/plaits/dsp/engine/additive_engine.cc \
+	eurorack/plaits/resources.cc \
+	eurorack/stmlib/dsp/units.cc
+
+include makefile.inc
diff --git a/osc_fm.mk b/osc_fm.mk
new file mode 100644
index 0000000..23dbb8e
--- /dev/null
+++ b/osc_fm.mk
@@ -0,0 +1,8 @@
+OSCILLATOR = fm
+
+UCXXSRC = macro-oscillator2.cc \
+	eurorack/plaits/dsp/engine/fm_engine.cc \
+	eurorack/plaits/resources.cc \
+	eurorack/stmlib/dsp/units.cc
+
+include makefile.inc
diff --git a/osc_gr.mk b/osc_gr.mk
new file mode 100644
index 0000000..de7daad
--- /dev/null
+++ b/osc_gr.mk
@@ -0,0 +1,8 @@
+OSCILLATOR = gr
+
+UCXXSRC = macro-oscillator2.cc \
+	eurorack/plaits/dsp/engine/grain_engine.cc \
+	eurorack/plaits/resources.cc \
+	eurorack/stmlib/dsp/units.cc
+
+include makefile.inc
diff --git a/osc_va.mk b/osc_va.mk
new file mode 100644
index 0000000..d10011a
--- /dev/null
+++ b/osc_va.mk
@@ -0,0 +1,7 @@
+OSCILLATOR = va
+
+UCXXSRC = macro-oscillator2.cc \
+	eurorack/plaits/dsp/engine/virtual_analog_engine.cc \
+	eurorack/stmlib/dsp/units.cc
+
+include makefile.inc
diff --git a/osc_ws.mk b/osc_ws.mk
new file mode 100644
index 0000000..780107d
--- /dev/null
+++ b/osc_ws.mk
@@ -0,0 +1,8 @@
+OSCILLATOR = ws
+
+UCXXSRC = macro-oscillator2.cc \
+	eurorack/plaits/dsp/engine/waveshaping_engine.cc \
+	eurorack/plaits/resources.cc \
+	eurorack/stmlib/dsp/units.cc
+
+include makefile.inc