diff --git a/Builds/MacOSX/Info-AU.plist b/Builds/MacOSX/Info-AU.plist
index ca6fcbf..897beee 100644
--- a/Builds/MacOSX/Info-AU.plist
+++ b/Builds/MacOSX/Info-AU.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0.0</string>
+    <string>0.0.1</string>
     <key>CFBundleVersion</key>
-    <string>1.0.0</string>
+    <string>0.0.1</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>
@@ -41,7 +41,7 @@
         <key>subtype</key>
         <string>Znof</string>
         <key>version</key>
-        <integer>65536</integer>
+        <integer>1</integer>
         <key>resourceUsage</key>
         <dict>
           <key>network.client</key>
diff --git a/Builds/MacOSX/Info-VST.plist b/Builds/MacOSX/Info-VST.plist
index f21ffbc..d6967df 100644
--- a/Builds/MacOSX/Info-VST.plist
+++ b/Builds/MacOSX/Info-VST.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0.0</string>
+    <string>0.0.1</string>
     <key>CFBundleVersion</key>
-    <string>1.0.0</string>
+    <string>0.0.1</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>
diff --git a/Builds/MacOSX/Xen MIDI Retuner.xcodeproj/project.pbxproj b/Builds/MacOSX/Xen MIDI Retuner.xcodeproj/project.pbxproj
index 69edb4e..0559768 100644
--- a/Builds/MacOSX/Xen MIDI Retuner.xcodeproj/project.pbxproj	
+++ b/Builds/MacOSX/Xen MIDI Retuner.xcodeproj/project.pbxproj	
@@ -89,6 +89,14 @@
 			isa = PBXBuildFile;
 			fileRef = C3936DB2289AAC287026C989;
 		};
+		1B5031CDCA9C3DD30C3E5154 = {
+			isa = PBXBuildFile;
+			fileRef = 6FE4377EB7BB52380E101748;
+		};
+		075D8B75755FF325E83D6762 = {
+			isa = PBXBuildFile;
+			fileRef = 00048E2734552BF26B00F194;
+		};
 		7A4148BF5DD461DB551FF938 = {
 			isa = PBXBuildFile;
 			fileRef = 3C976980A8AFFAC031E0ACB5;
@@ -201,6 +209,13 @@
 			isa = PBXBuildFile;
 			fileRef = 3201BBDF6CBDBB944C5CF3EF;
 		};
+		00048E2734552BF26B00F194 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = ConversionModule.cpp;
+			path = ../../Source/EditorModules/ConversionModule.cpp;
+			sourceTree = "SOURCE_ROOT";
+		};
 		02E3E350F5A9FE993AA8E19E = {
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
@@ -292,6 +307,13 @@
 			path = "Info-VST.plist";
 			sourceTree = "SOURCE_ROOT";
 		};
+		2A3E8FC3B07CEF4001D44ECD = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = ConversionModule.h;
+			path = ../../Source/EditorModules/ConversionModule.h;
+			sourceTree = "SOURCE_ROOT";
+		};
 		3201BBDF6CBDBB944C5CF3EF = {
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.objcpp;
@@ -432,6 +454,13 @@
 			path = "../../JuceLibraryCode/include_juce_events.mm";
 			sourceTree = "SOURCE_ROOT";
 		};
+		5F34A5DC34DED319D1E7DBB5 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = TransitionCurve.h;
+			path = ../../Source/EditorModules/Components/TransitionCurve.h;
+			sourceTree = "SOURCE_ROOT";
+		};
 		626DE35A07C14E9C7805A3F2 = {
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
@@ -481,6 +510,13 @@
 			path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp";
 			sourceTree = "SOURCE_ROOT";
 		};
+		6FE4377EB7BB52380E101748 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = TransitionCurve.cpp;
+			path = ../../Source/EditorModules/Components/TransitionCurve.cpp;
+			sourceTree = "SOURCE_ROOT";
+		};
 		7192D37C17A7B8FE607A8E52 = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -816,9 +852,21 @@
 			name = "AnaMark-Tuning-Library";
 			sourceTree = "<group>";
 		};
+		474B3AFCA7470F35C6888DD9 = {
+			isa = PBXGroup;
+			children = (
+				6FE4377EB7BB52380E101748,
+				5F34A5DC34DED319D1E7DBB5,
+			);
+			name = Components;
+			sourceTree = "<group>";
+		};
 		6792A254C5601E7BA485AE5F = {
 			isa = PBXGroup;
 			children = (
+				474B3AFCA7470F35C6888DD9,
+				00048E2734552BF26B00F194,
+				2A3E8FC3B07CEF4001D44ECD,
 				3C976980A8AFFAC031E0ACB5,
 				57ED0995A1491A98A5B877D9,
 				A50287DE07ED2C64E7FCF827,
@@ -994,8 +1042,8 @@
 					"_DEBUG=1",
 					"DEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=1.0.0",
-					"JUCE_APP_VERSION_HEX=0x10000",
+					"JUCE_APP_VERSION=0.0.1",
+					"JUCE_APP_VERSION_HEX=0x1",
 					"JucePlugin_Build_VST=1",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=0",
@@ -1046,8 +1094,8 @@
 					"_NDEBUG=1",
 					"NDEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=1.0.0",
-					"JUCE_APP_VERSION_HEX=0x10000",
+					"JUCE_APP_VERSION=0.0.1",
+					"JUCE_APP_VERSION_HEX=0x1",
 					"JucePlugin_Build_VST=1",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=0",
@@ -1100,8 +1148,8 @@
 					"_DEBUG=1",
 					"DEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=1.0.0",
-					"JUCE_APP_VERSION_HEX=0x10000",
+					"JUCE_APP_VERSION=0.0.1",
+					"JUCE_APP_VERSION_HEX=0x1",
 					"JucePlugin_Build_VST=0",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=1",
@@ -1153,8 +1201,8 @@
 					"_NDEBUG=1",
 					"NDEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=1.0.0",
-					"JUCE_APP_VERSION_HEX=0x10000",
+					"JUCE_APP_VERSION=0.0.1",
+					"JUCE_APP_VERSION_HEX=0x1",
 					"JucePlugin_Build_VST=0",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=1",
@@ -1206,8 +1254,8 @@
 					"_DEBUG=1",
 					"DEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=1.0.0",
-					"JUCE_APP_VERSION_HEX=0x10000",
+					"JUCE_APP_VERSION=0.0.1",
+					"JUCE_APP_VERSION_HEX=0x1",
 					"JucePlugin_Build_VST=1",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=1",
@@ -1252,8 +1300,8 @@
 					"_NDEBUG=1",
 					"NDEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=1.0.0",
-					"JUCE_APP_VERSION_HEX=0x10000",
+					"JUCE_APP_VERSION=0.0.1",
+					"JUCE_APP_VERSION_HEX=0x1",
 					"JucePlugin_Build_VST=1",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=1",
@@ -1571,6 +1619,8 @@
 				17372AEC0D5E16E464930928,
 				03C6F67EAC5A9B746DD0CE67,
 				C4EECD3F23C1D751C309C5D3,
+				1B5031CDCA9C3DD30C3E5154,
+				075D8B75755FF325E83D6762,
 				7A4148BF5DD461DB551FF938,
 				B2BC02A9FE7155E80DAE91C0,
 				A6CD8719005EAB700CB6828F,
diff --git a/JuceLibraryCode/AppConfig.h b/JuceLibraryCode/AppConfig.h
index 7758130..db1f81d 100644
--- a/JuceLibraryCode/AppConfig.h
+++ b/JuceLibraryCode/AppConfig.h
@@ -368,13 +368,13 @@
  #define JucePlugin_EditorRequiresKeyboardFocus  1
 #endif
 #ifndef  JucePlugin_Version
- #define JucePlugin_Version                1.0.0
+ #define JucePlugin_Version                0.0.1
 #endif
 #ifndef  JucePlugin_VersionCode
- #define JucePlugin_VersionCode            0x10000
+ #define JucePlugin_VersionCode            0x1
 #endif
 #ifndef  JucePlugin_VersionString
- #define JucePlugin_VersionString          "1.0.0"
+ #define JucePlugin_VersionString          "0.0.1"
 #endif
 #ifndef  JucePlugin_VSTUniqueID
  #define JucePlugin_VSTUniqueID            JucePlugin_PluginCode
diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h
index 9486551..654b3ad 100644
--- a/JuceLibraryCode/JuceHeader.h
+++ b/JuceLibraryCode/JuceHeader.h
@@ -50,7 +50,7 @@ namespace ProjectInfo
 {
     const char* const  projectName    = "Xen MIDI Retuner";
     const char* const  companyName    = "Taras Palczynski III";
-    const char* const  versionString  = "1.0.0";
-    const int          versionNumber  = 0x10000;
+    const char* const  versionString  = "0.0.1";
+    const int          versionNumber  = 0x1;
 }
 #endif
diff --git a/Source/EditorModules/Components/TransitionCurve.cpp b/Source/EditorModules/Components/TransitionCurve.cpp
new file mode 100644
index 0000000..e79bb2b
--- /dev/null
+++ b/Source/EditorModules/Components/TransitionCurve.cpp
@@ -0,0 +1,163 @@
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 5.4.7
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2017 - ROLI Ltd.
+
+  ==============================================================================
+*/
+
+//[Headers] You can add your own extra header files here...
+//[/Headers]
+
+#include "TransitionCurve.h"
+
+
+//[MiscUserDefs] You can add your own user definitions and misc code here...
+//[/MiscUserDefs]
+
+//==============================================================================
+TransitionCurve::TransitionCurve ()
+{
+    //[Constructor_pre] You can add your own custom stuff here..
+    //[/Constructor_pre]
+
+
+    //[UserPreSize]
+    //[/UserPreSize]
+
+    setSize (600, 400);
+
+
+    //[Constructor] You can add your own custom stuff here..
+    //[/Constructor]
+}
+
+TransitionCurve::~TransitionCurve()
+{
+    //[Destructor_pre]. You can add your own custom destruction code here..
+    //[/Destructor_pre]
+
+
+
+    //[Destructor]. You can add your own custom destruction code here..
+    //[/Destructor]
+}
+
+//==============================================================================
+void TransitionCurve::paint (Graphics& g)
+{
+    //[UserPrePaint] Add your own custom painting code here..
+    {
+        float x = 0, y = 0;
+        Colour strokeColour = Colour (0xffa52a8d);
+        //[UserPaintCustomArguments] Customize the painting arguments here..
+        //[/UserPaintCustomArguments]
+        g.setColour (strokeColour);
+        g.strokePath (internalPath1, PathStrokeType (5.000f, PathStrokeType::curved, PathStrokeType::rounded), AffineTransform::translation(x, y));
+    }
+    //[/UserPrePaint]
+
+    //[UserPaint] Add your own custom painting code here..
+    //[/UserPaint]
+}
+
+void TransitionCurve::resized()
+{
+    //[UserPreResize] Add your own custom resize code here..
+    setTransition(0.0f);
+    //[/UserPreResize]
+
+    //[UserResized] Add your own custom resize handling here..
+    //[/UserResized]
+}
+
+
+
+//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
+void TransitionCurve::setTransition(float transition)
+{
+    float cubicEnd = 0.75f;
+    float transitionCapped = jlimit(0.0f, cubicEnd, transition);
+    float transitionToStraight = jlimit(cubicEnd, 1.0f, transition);
+
+    internalPath1.clear();
+
+    // TODO: REVIEW: Does these Point<float>'s get properly deallocated once the function ends?
+    Point<float> *startPoint = new Point<float>(horizontalMargin, proportionOfHeight (1.0000f) - verticalMargin);
+    internalPath1.startNewSubPath(*startPoint);
+
+    Point<float> *cubicStartPoint = new Point<float>(jmap(transitionCapped, cubicEnd, 0.0f, (float)horizontalMargin, (float)proportionOfWidth(0.5f)), proportionOfHeight (1.0000f) - verticalMargin);
+    internalPath1.lineTo(*cubicStartPoint);
+
+    Point<float> *cubicWeightLeft = new Point<float>(jmap(transitionToStraight, cubicEnd, 1.0f, (float)proportionOfWidth (0.5000f), (float)horizontalMargin), proportionOfHeight (1.0000f) - verticalMargin);
+    Point<float> *cubicWeightRight = new Point<float>(jmap(transitionToStraight, cubicEnd, 1.0f, (float)proportionOfWidth (0.5000f), (float)proportionOfWidth(1.0f) - horizontalMargin), verticalMargin);
+    Point<float> *lineRightStart = new Point<float>(jmap(transitionCapped, cubicEnd, 0.0f, (float)proportionOfWidth(1.0f) - horizontalMargin, (float)proportionOfWidth(0.5f)), verticalMargin);
+    internalPath1.cubicTo(*cubicWeightLeft, *cubicWeightRight, *lineRightStart);
+
+    Point<float> *lineRightEnd = new Point<float>(getWidth() - horizontalMargin, verticalMargin);
+    internalPath1.lineTo (*lineRightEnd);
+
+    repaint();
+}
+
+float TransitionCurve::evaluate(float xPercent)
+{
+    float lineXPoint = jmap(xPercent, 0.0f, 1.0f, (float)horizontalMargin, (float)proportionOfWidth(1.0f) - horizontalMargin);
+    evaluationLine.setStart(lineXPoint, verticalMargin);
+    evaluationLine.setEnd(lineXPoint, proportionOfHeight(1.0f) - verticalMargin);
+
+    PathFlatteningIterator i (internalPath1);
+
+    Point<float> intersectionPoint;
+    while (i.next())
+    {
+        const Line<float> line (i.x1, i.y1, i.x2, i.y2);
+
+        bool intersected = line.intersects(evaluationLine, intersectionPoint);
+
+        if (intersected) break;
+    }
+
+    // Points origin is top left, but highest point should return 1.0f, not 0.0f.
+    float evaluation = jmap(intersectionPoint.y, (float)verticalMargin, (float)proportionOfHeight(1.0f) - verticalMargin, 1.0f, 0.0f);
+
+    return evaluation;
+}
+//[/MiscUserCode]
+
+
+//==============================================================================
+#if 0
+/*  -- Projucer information section --
+
+    This is where the Projucer stores the metadata that describe this GUI layout, so
+    make changes in here at your peril!
+
+BEGIN_JUCER_METADATA
+
+<JUCER_COMPONENT documentType="Component" className="TransitionCurve" componentName=""
+                 parentClasses="public Component" constructorParams="" variableInitialisers=""
+                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
+                 fixedSize="0" initialWidth="600" initialHeight="400">
+  <BACKGROUND backgroundColour="323e44"/>
+</JUCER_COMPONENT>
+
+END_JUCER_METADATA
+*/
+#endif
+
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
diff --git a/Source/EditorModules/Components/TransitionCurve.h b/Source/EditorModules/Components/TransitionCurve.h
new file mode 100644
index 0000000..e986c35
--- /dev/null
+++ b/Source/EditorModules/Components/TransitionCurve.h
@@ -0,0 +1,73 @@
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 5.4.7
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2017 - ROLI Ltd.
+
+  ==============================================================================
+*/
+
+#pragma once
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+#include <map>
+//[/Headers]
+
+
+
+//==============================================================================
+/**
+                                                                    //[Comments]
+    An auto-generated component, created by the Projucer.
+
+    Describe your class and how it works here!
+                                                                    //[/Comments]
+*/
+class TransitionCurve  : public Component
+{
+public:
+    //==============================================================================
+    TransitionCurve ();
+    ~TransitionCurve() override;
+
+    //==============================================================================
+    //[UserMethods]     -- You can add your own custom methods in this section.
+    void setTransition(float transition);
+    float evaluate(float xPosition);
+    //[/UserMethods]
+
+    void paint (Graphics& g) override;
+    void resized() override;
+
+
+
+private:
+    //[UserVariables]   -- You can add your own custom variables in this section.
+    int horizontalMargin = 40;
+    int verticalMargin = 40;
+
+    Path internalPath1;
+    Line<float> evaluationLine;
+    //[/UserVariables]
+
+    //==============================================================================
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TransitionCurve)
+};
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
diff --git a/Source/EditorModules/ConversionModule.cpp b/Source/EditorModules/ConversionModule.cpp
new file mode 100644
index 0000000..03fabeb
--- /dev/null
+++ b/Source/EditorModules/ConversionModule.cpp
@@ -0,0 +1,181 @@
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 5.4.7
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2017 - ROLI Ltd.
+
+  ==============================================================================
+*/
+
+//[Headers] You can add your own extra header files here...
+//[/Headers]
+
+#include "ConversionModule.h"
+
+
+//[MiscUserDefs] You can add your own user definitions and misc code here...
+//[/MiscUserDefs]
+
+//==============================================================================
+ConversionModule::ConversionModule ()
+{
+    //[Constructor_pre] You can add your own custom stuff here..
+    //[/Constructor_pre]
+
+    section_title.reset (new Label ("section_title",
+                                    TRANS("Conversion\n")));
+    addAndMakeVisible (section_title.get());
+    section_title->setFont (Font (22.00f, Font::plain).withTypefaceStyle ("Bold"));
+    section_title->setJustificationType (Justification::centredTop);
+    section_title->setEditable (false, false, false);
+    section_title->setColour (TextEditor::textColourId, Colours::black);
+    section_title->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
+
+    transitionCurve.reset (new TransitionCurve());
+    addAndMakeVisible (transitionCurve.get());
+    slider.reset (new Slider ("new slider"));
+    addAndMakeVisible (slider.get());
+    slider->setRange (0, 1, 0);
+    slider->setSliderStyle (Slider::RotaryHorizontalVerticalDrag);
+    slider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20);
+    slider->addListener (this);
+
+    slider->setBounds (0, 80, 104, 104);
+
+    label.reset (new Label ("new label",
+                            TRANS("Scale Note Snapping Curve")));
+    addAndMakeVisible (label.get());
+    label->setFont (Font (15.00f, Font::plain).withTypefaceStyle ("Regular"));
+    label->setJustificationType (Justification::centred);
+    label->setEditable (false, false, false);
+    label->setColour (TextEditor::textColourId, Colours::black);
+    label->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
+
+    label->setBounds (0, 40, 104, 40);
+
+
+    //[UserPreSize]
+    //[/UserPreSize]
+
+    setSize (600, 400);
+
+
+    //[Constructor] You can add your own custom stuff here..
+    //[/Constructor]
+}
+
+ConversionModule::~ConversionModule()
+{
+    //[Destructor_pre]. You can add your own custom destruction code here..
+    //[/Destructor_pre]
+
+    section_title = nullptr;
+    transitionCurve = nullptr;
+    slider = nullptr;
+    label = nullptr;
+
+
+    //[Destructor]. You can add your own custom destruction code here..
+    //[/Destructor]
+}
+
+//==============================================================================
+void ConversionModule::paint (Graphics& g)
+{
+    //[UserPrePaint] Add your own custom painting code here..
+    //[/UserPrePaint]
+
+    //[UserPaint] Add your own custom painting code here..
+    //[/UserPaint]
+}
+
+void ConversionModule::resized()
+{
+    //[UserPreResize] Add your own custom resize code here..
+    //[/UserPreResize]
+
+    section_title->setBounds (0, 0, proportionOfWidth (1.0000f), 24);
+    transitionCurve->setBounds (proportionOfWidth (0.1000f), 32, proportionOfWidth (0.9000f), 208);
+    //[UserResized] Add your own custom resize handling here..
+    //[/UserResized]
+}
+
+void ConversionModule::sliderValueChanged (Slider* sliderThatWasMoved)
+{
+    //[UsersliderValueChanged_Pre]
+    //[/UsersliderValueChanged_Pre]
+
+    if (sliderThatWasMoved == slider.get())
+    {
+        //[UserSliderCode_slider] -- add your slider handling code here..
+        transitionCurve->setTransition(slider->getValue());
+        //[/UserSliderCode_slider]
+    }
+
+    //[UsersliderValueChanged_Post]
+    //[/UsersliderValueChanged_Post]
+}
+
+
+
+//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
+TransitionCurve *ConversionModule::getTransitionCurve()
+{
+    return &(*transitionCurve);
+}
+//[/MiscUserCode]
+
+
+//==============================================================================
+#if 0
+/*  -- Projucer information section --
+
+    This is where the Projucer stores the metadata that describe this GUI layout, so
+    make changes in here at your peril!
+
+BEGIN_JUCER_METADATA
+
+<JUCER_COMPONENT documentType="Component" className="ConversionModule" componentName=""
+                 parentClasses="public Component" constructorParams="" variableInitialisers=""
+                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
+                 fixedSize="0" initialWidth="600" initialHeight="400">
+  <BACKGROUND backgroundColour="323e44"/>
+  <LABEL name="section_title" id="a42bffd032a0d19b" memberName="section_title"
+         virtualName="" explicitFocusOrder="0" pos="0 0 100% 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="Conversion&#10;" editableSingleClick="0"
+         editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
+         fontsize="22.0" kerning="0.0" bold="1" italic="0" justification="12"
+         typefaceStyle="Bold"/>
+  <JUCERCOMP name="" id="58460eddec1ae63f" memberName="transitionCurve" virtualName=""
+             explicitFocusOrder="0" pos="9.991% 32 90.009% 208" sourceFile="Components/TransitionCurve.cpp"
+             constructorParams=""/>
+  <SLIDER name="new slider" id="9f561ed4f957bf22" memberName="slider" virtualName=""
+          explicitFocusOrder="0" pos="0 80 104 104" min="0.0" max="1.0"
+          int="0.0" style="RotaryHorizontalVerticalDrag" textBoxPos="NoTextBox"
+          textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
+          needsCallback="1"/>
+  <LABEL name="new label" id="de0e609ae3dc6772" memberName="label" virtualName=""
+         explicitFocusOrder="0" pos="0 40 104 40" edTextCol="ff000000"
+         edBkgCol="0" labelText="Scale Note Snapping Curve" editableSingleClick="0"
+         editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
+         fontsize="15.0" kerning="0.0" bold="0" italic="0" justification="36"/>
+</JUCER_COMPONENT>
+
+END_JUCER_METADATA
+*/
+#endif
+
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
diff --git a/Source/EditorModules/ConversionModule.h b/Source/EditorModules/ConversionModule.h
new file mode 100644
index 0000000..a0d6b57
--- /dev/null
+++ b/Source/EditorModules/ConversionModule.h
@@ -0,0 +1,73 @@
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 5.4.7
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2017 - ROLI Ltd.
+
+  ==============================================================================
+*/
+
+#pragma once
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+//[/Headers]
+
+#include "Components/TransitionCurve.h"
+
+
+//==============================================================================
+/**
+                                                                    //[Comments]
+    An auto-generated component, created by the Projucer.
+
+    Describe your class and how it works here!
+                                                                    //[/Comments]
+*/
+class ConversionModule  : public Component,
+                          public Slider::Listener
+{
+public:
+    //==============================================================================
+    ConversionModule ();
+    ~ConversionModule() override;
+
+    //==============================================================================
+    //[UserMethods]     -- You can add your own custom methods in this section.
+    TransitionCurve *getTransitionCurve();
+    //[/UserMethods]
+
+    void paint (Graphics& g) override;
+    void resized() override;
+    void sliderValueChanged (Slider* sliderThatWasMoved) override;
+
+
+
+private:
+    //[UserVariables]   -- You can add your own custom variables in this section.
+    //[/UserVariables]
+
+    //==============================================================================
+    std::unique_ptr<Label> section_title;
+    std::unique_ptr<TransitionCurve> transitionCurve;
+    std::unique_ptr<Slider> slider;
+    std::unique_ptr<Label> label;
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConversionModule)
+};
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
diff --git a/Source/EditorModules/InputModule.cpp b/Source/EditorModules/InputModule.cpp
index 0bd9882..bc823a6 100644
--- a/Source/EditorModules/InputModule.cpp
+++ b/Source/EditorModules/InputModule.cpp
@@ -46,7 +46,7 @@ InputModule::InputModule (XenMidiRetunerAudioProcessor *midiProcessor)
 
     in_pitch_bend_range.reset (new Slider ("new slider"));
     addAndMakeVisible (in_pitch_bend_range.get());
-    in_pitch_bend_range->setRange (0, 48, 1);
+    in_pitch_bend_range->setRange (1, 96, 1);
     in_pitch_bend_range->setSliderStyle (Slider::IncDecButtons);
     in_pitch_bend_range->setTextBoxStyle (Slider::TextBoxLeft, false, 80, 20);
     in_pitch_bend_range->addListener (this);
@@ -77,11 +77,8 @@ InputModule::InputModule (XenMidiRetunerAudioProcessor *midiProcessor)
     addAndMakeVisible (singleChannelPriorityMode.get());
     singleChannelPriorityMode->setEditableText (false);
     singleChannelPriorityMode->setJustificationType (Justification::centredLeft);
-    singleChannelPriorityMode->setTextWhenNothingSelected (TRANS("Note"));
-    singleChannelPriorityMode->setTextWhenNoChoicesAvailable (TRANS("Note"));
-    singleChannelPriorityMode->addItem (TRANS("Note"), 1);
-    singleChannelPriorityMode->addItem (TRANS("Velocity"), 2);
-    singleChannelPriorityMode->addItem (TRANS("Random"), 3);
+    singleChannelPriorityMode->setTextWhenNothingSelected (String());
+    singleChannelPriorityMode->setTextWhenNoChoicesAvailable (String());
     singleChannelPriorityMode->addListener (this);
 
     singleChannelPriorityMode->setBounds (8, 144, 144, 24);
@@ -101,12 +98,8 @@ InputModule::InputModule (XenMidiRetunerAudioProcessor *midiProcessor)
     addAndMakeVisible (singleChannelPriorityModifier.get());
     singleChannelPriorityModifier->setEditableText (false);
     singleChannelPriorityModifier->setJustificationType (Justification::centredLeft);
-    singleChannelPriorityModifier->setTextWhenNothingSelected (TRANS("Most Recent"));
-    singleChannelPriorityModifier->setTextWhenNoChoicesAvailable (TRANS("Most Recent"));
-    singleChannelPriorityModifier->addItem (TRANS("Most Recent"), 1);
-    singleChannelPriorityModifier->addItem (TRANS("Oldest"), 2);
-    singleChannelPriorityModifier->addItem (TRANS("Greatest"), 3);
-    singleChannelPriorityModifier->addItem (TRANS("Lowest"), 4);
+    singleChannelPriorityModifier->setTextWhenNothingSelected (String());
+    singleChannelPriorityModifier->setTextWhenNoChoicesAvailable (String());
     singleChannelPriorityModifier->addListener (this);
 
     singleChannelPriorityModifier->setBounds (8, 192, 144, 24);
@@ -136,12 +129,18 @@ InputModule::InputModule (XenMidiRetunerAudioProcessor *midiProcessor)
 
 
     //[UserPreSize]
+    singleChannelPriorityMode->addItemList(processor->singleChannelNotePriority->choices, 1);
+    singleChannelPriorityMode->setSelectedItemIndex(processor->singleChannelNotePriority->getIndex());
+
+    singleChannelPriorityModifier->addItemList(processor->singleChannelNotePriorityModifier->choices, 1);
+    singleChannelPriorityModifier->setSelectedItemIndex(processor->singleChannelNotePriorityModifier->getIndex());
     //[/UserPreSize]
 
     setSize (600, 400);
 
 
     //[Constructor] You can add your own custom stuff here..
+    in_pitch_bend_range->setValue(processor->in_pitch_bend_range->get());
     //[/Constructor]
 }
 
@@ -193,7 +192,7 @@ void InputModule::sliderValueChanged (Slider* sliderThatWasMoved)
     if (sliderThatWasMoved == in_pitch_bend_range.get())
     {
         //[UserSliderCode_in_pitch_bend_range] -- add your slider handling code here..
-        processor->in_pitch_bend_range = sliderThatWasMoved->getValue();
+        *(processor->in_pitch_bend_range) = sliderThatWasMoved->getValue();
         //[/UserSliderCode_in_pitch_bend_range]
     }
 
@@ -209,13 +208,13 @@ void InputModule::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
     if (comboBoxThatHasChanged == singleChannelPriorityMode.get())
     {
         //[UserComboBoxCode_singleChannelPriorityMode] -- add your combo box handling code here..
-        processor->singleChannelNotePriority = (SingleChannelNotePrioritzation)singleChannelPriorityMode->getSelectedItemIndex();
+        *(processor->singleChannelNotePriority) = singleChannelPriorityMode->getSelectedItemIndex();
         //[/UserComboBoxCode_singleChannelPriorityMode]
     }
     else if (comboBoxThatHasChanged == singleChannelPriorityModifier.get())
     {
         //[UserComboBoxCode_singleChannelPriorityModifier] -- add your combo box handling code here..
-        processor->singleChannelNotePriorityModifier = (SingleChannelNotePrioritzationModifier)singleChannelPriorityModifier->getSelectedItemIndex();
+        *(processor->singleChannelNotePriorityModifier) = singleChannelPriorityModifier->getSelectedItemIndex();
         //[/UserComboBoxCode_singleChannelPriorityModifier]
     }
     else if (comboBoxThatHasChanged == interploationDimension.get())
@@ -255,8 +254,8 @@ BEGIN_JUCER_METADATA
          focusDiscardsChanges="0" fontname="Default font" fontsize="15.0"
          kerning="0.0" bold="0" italic="0" justification="33"/>
   <SLIDER name="new slider" id="b64c5755e8e89a8b" memberName="in_pitch_bend_range"
-          virtualName="" explicitFocusOrder="0" pos="8 64 150 24" min="0.0"
-          max="48.0" int="1.0" style="IncDecButtons" textBoxPos="TextBoxLeft"
+          virtualName="" explicitFocusOrder="0" pos="8 64 150 24" min="1.0"
+          max="96.0" int="1.0" style="IncDecButtons" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <LABEL name="new label" id="12ca6725baa12ffb" memberName="label3" virtualName=""
@@ -272,8 +271,7 @@ BEGIN_JUCER_METADATA
          kerning="0.0" bold="1" italic="0" justification="12" typefaceStyle="Bold"/>
   <COMBOBOX name="new combo box" id="34c558f948bf284a" memberName="singleChannelPriorityMode"
             virtualName="" explicitFocusOrder="0" pos="8 144 144 24" editable="0"
-            layout="33" items="Note&#10;Velocity&#10;Random" textWhenNonSelected="Note"
-            textWhenNoItems="Note"/>
+            layout="33" items="" textWhenNonSelected="" textWhenNoItems=""/>
   <LABEL name="new label" id="1112cb5e9cdc4f37" memberName="label2" virtualName=""
          explicitFocusOrder="0" pos="8 104 144 32" edTextCol="ff000000"
          edBkgCol="0" labelText="Single Channel Note Prioritization" editableSingleClick="0"
@@ -281,8 +279,7 @@ BEGIN_JUCER_METADATA
          fontsize="15.0" kerning="0.0" bold="0" italic="0" justification="12"/>
   <COMBOBOX name="new combo box" id="2ebd7ab8a0c8a16" memberName="singleChannelPriorityModifier"
             virtualName="" explicitFocusOrder="0" pos="8 192 144 24" editable="0"
-            layout="33" items="Most Recent&#10;Oldest&#10;Greatest&#10;Lowest"
-            textWhenNonSelected="Most Recent" textWhenNoItems="Most Recent"/>
+            layout="33" items="" textWhenNonSelected="" textWhenNoItems=""/>
   <LABEL name="new label" id="28b8d285343a10c" memberName="label5" virtualName=""
          explicitFocusOrder="0" pos="8 232 144 32" edTextCol="ff000000"
          edBkgCol="0" labelText="Interploation Dimension&#10;" editableSingleClick="0"
diff --git a/Source/EditorModules/NoteAndFrequencyOverlay.cpp b/Source/EditorModules/NoteAndFrequencyOverlay.cpp
index 0c9e6fe..e206f34 100644
--- a/Source/EditorModules/NoteAndFrequencyOverlay.cpp
+++ b/Source/EditorModules/NoteAndFrequencyOverlay.cpp
@@ -19,6 +19,7 @@
 
 //[Headers] You can add your own extra header files here...
 #include "../Utilities.h"
+#include <sstream> //for std::stringstream
 //[/Headers]
 
 #include "NoteAndFrequencyOverlay.h"
@@ -88,54 +89,88 @@ void NoteAndFrequencyOverlay::paint (Graphics& g)
     int y = 0, width = 1, height = 100;
     int widthOfComponent = proportionOfWidth(1.0f);
     for (int i = 0; i < MAX_MIDI_CHANNELS; i++) {
-        for (std::vector<Note>::iterator it = processor->input[i].notes.begin(); it != processor->input[i].notes.end(); ++it) {
-            // FIXME:  Created "Segmentation Fault: 11" on multiple occasions, usually after using the plugin for a couple of minutes
-            float continuousMidiNote = it->midiNote + pitchwheelPosToSemitones(processor->input[i].pitchwheel, processor->in_pitch_bend_range);
-            
-            double x = keyboard->ConvertContinuousMidiNoteToPercentWidth(continuousMidiNote) * widthOfComponent;
-            double midiNoteX = keyboard->ConvertDiscreteMidiNoteToPercentWidth(it->midiNote) * widthOfComponent;
-
-            Note *currentNote = &(*it);
-            
-            if (currentNote == processor->input[i].priorityNote) {
-                // Out pitchbend visualzation under priority note
-                Colour fillColour = Colour (0x3f00ffb2);
-                int x1 = keyboard->ConvertContinuousMidiNoteToPercentWidth((float)it->midiNote - processor->in_pitch_bend_range) * widthOfComponent;
-                int x2 = keyboard->ConvertContinuousMidiNoteToPercentWidth((float)it->midiNote + processor->in_pitch_bend_range) * widthOfComponent;
-                
-                g.setColour (fillColour);
-                g.fillRect (x1, y, x2 - x1, height);
-                
-                /*
-                // Show the resolution of MIDI 1's 14 bit pitchwheel parameter
-                for (int p = 0; p <= 16383; p++)
-                {
-                    double offset = pitchwheelPosToSemitones(p, processor->out_pitch_bend_range);
+        // Check to see if input vector is being used on the processor thread
+        const ScopedTryLock myScopedTryLock (processor->inputLock);
+
+        if (myScopedTryLock.isLocked())
+        {
+            for (std::vector<Note>::iterator it = processor->input[i].notes.begin(); it != processor->input[i].notes.end(); ++it) {
+                float continuousMidiNote = it->midiNote + pitchwheelPosToSemitones(processor->input[i].pitchwheel, processor->in_pitch_bend_range->get());
+
+                double x = keyboard->ConvertContinuousMidiNoteToPercentWidth(continuousMidiNote) * widthOfComponent;
+                double midiNoteX = keyboard->ConvertDiscreteMidiNoteToPercentWidth(it->midiNote) * widthOfComponent;
+
+                Note *currentNote = &(*it);
+
+                if (currentNote == processor->input[i].priorityNote) {
+                    // In pitchbend visualzation under priority note
+                    Colour fillColour = Colour (0x3f00ffb2);
+                    int x1 = keyboard->ConvertContinuousMidiNoteToPercentWidth((float)it->midiNote - processor->in_pitch_bend_range->get()) * widthOfComponent;
+                    int x2 = keyboard->ConvertContinuousMidiNoteToPercentWidth((float)it->midiNote + processor->in_pitch_bend_range->get()) * widthOfComponent;
+
+                    g.setColour (fillColour);
+                    g.fillRect (x1, y, x2 - x1, height);
+
+                    /*
+                    // Show the resolution of MIDI 1's 14 bit pitchwheel parameter
+                    for (int p = 0; p <= 16383; p++)
+                    {
+                        double offset = pitchwheelPosToSemitones(p, processor->out_pitch_bend_range);
+                        g.setColour (fillColour);
+                        g.fillRect (x1 + offset, y, 1, height);
+                    }
+                     */
+
+                    // Draw Continous priority note
+                    fillColour = Colour (0xff00ffb2);
+                    g.setColour (fillColour);
+                    g.fillRect (x - 1, y, width + 3, height);
+
+                    // Draw prioirty note
+                    fillColour = Colour (0xff00ffb2);
+                    g.setColour (fillColour);
+                    g.fillRect (midiNoteX - 1, y, width + 3, height);
+
+                    // Converted Note
+                    double xConverted = keyboard->ConvertContinuousMidiNoteToPercentWidth(processor->input[i].scaleConvertedPriorityNote) * widthOfComponent;
+                    fillColour = Colour (0xfffb00ff);
                     g.setColour (fillColour);
-                    g.fillRect (x1 + offset, y, 1, height);
+                    g.fillRect (xConverted - 1, y, width + 3, height);
+                } else {
+                    Colour fillColour = Colour (0xffd1e40b);
+
+                    // Draw Continous Note
+                    g.setColour (fillColour);
+                    g.fillRect (x, y, width, height);
+
+                    // Draw Note
+                    fillColour = Colour (0x5dd1e40b);
+                    g.setColour (fillColour);
+                    g.fillRect (midiNoteX, y, width, height);
                 }
-                 */
-                
-                // Draw Continous priority note
-                fillColour = Colour (0xff00ffb2);
-                g.setColour (fillColour);
-                g.fillRect (x - 1, y, width + 3, height);
-                
-                // Draw prioirty note
-                fillColour = Colour (0xff00ffb2);
+            }
+
+            if (processor->input[i].notes.size() > 0)
+            {
+                // Converted Note Closest Note
+                double xConverted = keyboard->ConvertDiscreteMidiNoteToPercentWidth(processor->output[i].initalMidiNote) * widthOfComponent;
+                Colour fillColour = Colour (0x4dfb00ff);
                 g.setColour (fillColour);
-                g.fillRect (midiNoteX - 1, y, width + 3, height);
-            } else {
-                Colour fillColour = Colour (0xffd1e40b);
-                
-                // Draw Continous Note
+                g.fillRect (xConverted - 1, y, width + 3, height);
+
+                // Out pitchbend
+                fillColour = Colour (0x3f00a2ff);
+                int x3 = keyboard->ConvertDiscreteMidiNoteToPercentWidth(processor->output[i].initalMidiNote - processor->out_pitch_bend_range->get()) * widthOfComponent;
+                int x4 = keyboard->ConvertDiscreteMidiNoteToPercentWidth(processor->output[i].initalMidiNote + processor->out_pitch_bend_range->get()) * widthOfComponent;
+
                 g.setColour (fillColour);
-                g.fillRect (x, y, width, height);
-                
-                // Draw Note
-                fillColour = Colour (0xffd1e40b);
+                g.fillRect (x3, y, x4 - x3, height);
+
+                // Current Midi Note
+                xConverted = keyboard->ConvertDiscreteMidiNoteToPercentWidth(processor->output[i].currentMidiNoteNumber) * widthOfComponent;
+                fillColour = Colour (0xffffae00);
                 g.setColour (fillColour);
-                g.fillRect (midiNoteX, y, width, height);
+                g.fillRect (xConverted - 1, y, width + 3, height);
             }
         }
     }
diff --git a/Source/EditorModules/ScaleEditor.cpp b/Source/EditorModules/ScaleEditor.cpp
index 725ced0..70ffbbf 100644
--- a/Source/EditorModules/ScaleEditor.cpp
+++ b/Source/EditorModules/ScaleEditor.cpp
@@ -33,12 +33,36 @@ ScaleEditor::ScaleEditor (XenMidiRetunerAudioProcessor *midiProcessor)
     processor = midiProcessor;
     //[/Constructor_pre]
 
-    textButton.reset (new TextButton ("new button"));
-    addAndMakeVisible (textButton.get());
-    textButton->setButtonText (TRANS("Load .tun File"));
-    textButton->addListener (this);
+    label.reset (new Label ("new label",
+                            TRANS("Scale\n")));
+    addAndMakeVisible (label.get());
+    label->setFont (Font (22.00f, Font::plain).withTypefaceStyle ("Bold"));
+    label->setJustificationType (Justification::centred);
+    label->setEditable (false, false, false);
+    label->setColour (TextEditor::textColourId, Colours::black);
+    label->setColour (TextEditor::backgroundColourId, Colour (0x00000000));
 
-    textButton->setBounds (8, 8, 150, 24);
+    importTunFile.reset (new TextButton ("new button"));
+    addAndMakeVisible (importTunFile.get());
+    importTunFile->setButtonText (TRANS("Load .tun File"));
+    importTunFile->addListener (this);
+
+    importTunFile->setBounds (8, 32, 150, 24);
+
+    resetScaleButton.reset (new TextButton ("new button"));
+    addAndMakeVisible (resetScaleButton.get());
+    resetScaleButton->setButtonText (TRANS("Reset"));
+    resetScaleButton->addListener (this);
+
+    resetScaleButton->setBounds (8, 64, 150, 24);
+
+    hyperlinkButton.reset (new HyperlinkButton (TRANS("Sevish Workshop"),
+                                                URL ("https://sevish.com/scaleworkshop/")));
+    addAndMakeVisible (hyperlinkButton.get());
+    hyperlinkButton->setTooltip (TRANS("https://sevish.com/scaleworkshop/"));
+    hyperlinkButton->setButtonText (TRANS("Sevish Workshop"));
+
+    hyperlinkButton->setBounds (8, 104, 150, 24);
 
 
     //[UserPreSize]
@@ -56,7 +80,10 @@ ScaleEditor::~ScaleEditor()
     //[Destructor_pre]. You can add your own custom destruction code here..
     //[/Destructor_pre]
 
-    textButton = nullptr;
+    label = nullptr;
+    importTunFile = nullptr;
+    resetScaleButton = nullptr;
+    hyperlinkButton = nullptr;
 
 
     //[Destructor]. You can add your own custom destruction code here..
@@ -78,6 +105,7 @@ void ScaleEditor::resized()
     //[UserPreResize] Add your own custom resize code here..
     //[/UserPreResize]
 
+    label->setBounds (0, 0, proportionOfWidth (1.0000f), 24);
     //[UserResized] Add your own custom resize handling here..
     //[/UserResized]
 }
@@ -87,9 +115,9 @@ void ScaleEditor::buttonClicked (Button* buttonThatWasClicked)
     //[UserbuttonClicked_Pre]
     //[/UserbuttonClicked_Pre]
 
-    if (buttonThatWasClicked == textButton.get())
+    if (buttonThatWasClicked == importTunFile.get())
     {
-        //[UserButtonCode_textButton] -- add your button handler code here..
+        //[UserButtonCode_importTunFile] -- add your button handler code here..
         FileChooser myChooser ("Please select the AnaMark Tuning file you want to load...",
                            File::getSpecialLocation (File::userHomeDirectory),
                            "*.tun");
@@ -100,7 +128,13 @@ void ScaleEditor::buttonClicked (Button* buttonThatWasClicked)
 
             processor->scale.Read(theFile.getFullPathName().toStdString().c_str());
         }
-        //[/UserButtonCode_textButton]
+        //[/UserButtonCode_importTunFile]
+    }
+    else if (buttonThatWasClicked == resetScaleButton.get())
+    {
+        //[UserButtonCode_resetScaleButton] -- add your button handler code here..
+        processor->scale.Reset();
+        //[/UserButtonCode_resetScaleButton]
     }
 
     //[UserbuttonClicked_Post]
@@ -127,9 +161,21 @@ BEGIN_JUCER_METADATA
                  variableInitialisers="" snapPixels="8" snapActive="1" snapShown="1"
                  overlayOpacity="0.330" fixedSize="0" initialWidth="600" initialHeight="400">
   <BACKGROUND backgroundColour="323e44"/>
-  <TEXTBUTTON name="new button" id="d2712430b72f9c65" memberName="textButton"
-              virtualName="" explicitFocusOrder="0" pos="8 8 150 24" buttonText="Load .tun File"
+  <LABEL name="new label" id="235c5745dedfe1ad" memberName="label" virtualName=""
+         explicitFocusOrder="0" pos="0 0 100% 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="Scale&#10;" editableSingleClick="0" editableDoubleClick="0"
+         focusDiscardsChanges="0" fontname="Default font" fontsize="22.0"
+         kerning="0.0" bold="1" italic="0" justification="36" typefaceStyle="Bold"/>
+  <TEXTBUTTON name="new button" id="d2712430b72f9c65" memberName="importTunFile"
+              virtualName="" explicitFocusOrder="0" pos="8 32 150 24" buttonText="Load .tun File"
+              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+  <TEXTBUTTON name="new button" id="2e643fc79257c780" memberName="resetScaleButton"
+              virtualName="" explicitFocusOrder="0" pos="8 64 150 24" buttonText="Reset"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+  <HYPERLINKBUTTON name="new hyperlink" id="6e1339fc3a50cbf" memberName="hyperlinkButton"
+                   virtualName="" explicitFocusOrder="0" pos="8 104 150 24" tooltip="https://sevish.com/scaleworkshop/"
+                   buttonText="Sevish Workshop" connectedEdges="0" needsCallback="0"
+                   radioGroupId="0" url="https://sevish.com/scaleworkshop/"/>
 </JUCER_COMPONENT>
 
 END_JUCER_METADATA
diff --git a/Source/EditorModules/ScaleEditor.h b/Source/EditorModules/ScaleEditor.h
index d78ed9a..6eb04de 100644
--- a/Source/EditorModules/ScaleEditor.h
+++ b/Source/EditorModules/ScaleEditor.h
@@ -59,7 +59,10 @@ class ScaleEditor  : public Component,
     //[/UserVariables]
 
     //==============================================================================
-    std::unique_ptr<TextButton> textButton;
+    std::unique_ptr<Label> label;
+    std::unique_ptr<TextButton> importTunFile;
+    std::unique_ptr<TextButton> resetScaleButton;
+    std::unique_ptr<HyperlinkButton> hyperlinkButton;
 
 
     //==============================================================================
diff --git a/Source/PluginGUI.cpp b/Source/PluginGUI.cpp
index 7d0604a..207b550 100644
--- a/Source/PluginGUI.cpp
+++ b/Source/PluginGUI.cpp
@@ -39,7 +39,7 @@ PluginGUI::PluginGUI (XenMidiRetunerAudioProcessor *processorA)
     addAndMakeVisible (scaleFrequenciesOverlay.get());
     out_pitch_bend_range.reset (new Slider ("new slider"));
     addAndMakeVisible (out_pitch_bend_range.get());
-    out_pitch_bend_range->setRange (0, 48, 1);
+    out_pitch_bend_range->setRange (1, 96, 1);
     out_pitch_bend_range->setSliderStyle (Slider::IncDecButtons);
     out_pitch_bend_range->setTextBoxStyle (Slider::TextBoxLeft, false, 80, 20);
     out_pitch_bend_range->addListener (this);
@@ -63,6 +63,8 @@ PluginGUI::PluginGUI (XenMidiRetunerAudioProcessor *processorA)
     addAndMakeVisible (component.get());
     component2.reset (new ScaleEditor (processor));
     addAndMakeVisible (component2.get());
+    conversionModule.reset (new ConversionModule());
+    addAndMakeVisible (conversionModule.get());
 
     //[UserPreSize]
     //[/UserPreSize]
@@ -71,6 +73,8 @@ PluginGUI::PluginGUI (XenMidiRetunerAudioProcessor *processorA)
 
 
     //[Constructor] You can add your own custom stuff here..
+    out_pitch_bend_range->setValue(processor->out_pitch_bend_range->get());
+    processor->interpolationCurve = conversionModule->getTransitionCurve();
     //[/Constructor]
 }
 
@@ -86,6 +90,7 @@ PluginGUI::~PluginGUI()
     noteAndFreqOverlay = nullptr;
     component = nullptr;
     component2 = nullptr;
+    conversionModule = nullptr;
 
 
     //[Destructor]. You can add your own custom destruction code here..
@@ -101,7 +106,7 @@ void PluginGUI::paint (Graphics& g)
     g.fillAll (Colour (0xff323e44));
 
     {
-        int x = 183, y = 0, width = 1, height = proportionOfHeight (0.8000f);
+        int x = proportionOfWidth (0.2000f), y = 0, width = 1, height = proportionOfHeight (0.8000f);
         Colour fillColour = Colour (0xffb6b6b6);
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -110,7 +115,16 @@ void PluginGUI::paint (Graphics& g)
     }
 
     {
-        int x = 815, y = 1, width = 1, height = proportionOfHeight (0.8000f);
+        int x = proportionOfWidth (0.8000f), y = 1, width = 1, height = proportionOfHeight (0.8000f);
+        Colour fillColour = Colour (0xffb6b6b6);
+        //[UserPaintCustomArguments] Customize the painting arguments here..
+        //[/UserPaintCustomArguments]
+        g.setColour (fillColour);
+        g.fillRect (x, y, width, height);
+    }
+
+    {
+        int x = proportionOfWidth (0.4000f), y = 0, width = 1, height = proportionOfHeight (0.8000f);
         Colour fillColour = Colour (0xffb6b6b6);
         //[UserPaintCustomArguments] Customize the painting arguments here..
         //[/UserPaintCustomArguments]
@@ -130,8 +144,9 @@ void PluginGUI::resized()
     keyboardVisual->setBounds (0, getHeight() - proportionOfHeight (0.2000f), proportionOfWidth (1.0000f), proportionOfHeight (0.2000f));
     scaleFrequenciesOverlay->setBounds (0 + 0, (getHeight() - proportionOfHeight (0.2000f)) + proportionOfHeight (0.2000f) - (roundToInt (proportionOfHeight (0.2000f) * 0.6000f)), roundToInt (proportionOfWidth (1.0000f) * 1.0000f), roundToInt (proportionOfHeight (0.2000f) * 0.6000f));
     noteAndFreqOverlay->setBounds (0 + 0, (getHeight() - proportionOfHeight (0.2000f)) + proportionOfHeight (0.2000f) - (roundToInt (proportionOfHeight (0.2000f) * 0.6000f)), roundToInt (proportionOfWidth (1.0000f) * 1.0000f), roundToInt (proportionOfHeight (0.2000f) * 0.6000f));
-    component->setBounds (0, 0, 176, proportionOfHeight (0.8000f));
-    component2->setBounds (proportionOfWidth (0.2000f), 0, proportionOfWidth (0.6000f), proportionOfHeight (0.8000f));
+    component->setBounds (0, 0, proportionOfWidth (0.2000f), proportionOfHeight (0.8000f));
+    component2->setBounds (proportionOfWidth (0.2000f), 0, proportionOfWidth (0.2000f), proportionOfHeight (0.8000f));
+    conversionModule->setBounds (proportionOfWidth (0.4000f), 0, proportionOfWidth (0.4000f), proportionOfHeight (0.8000f));
     //[UserResized] Add your own custom resize handling here..
     //[/UserResized]
 }
@@ -145,7 +160,7 @@ void PluginGUI::sliderValueChanged (Slider* sliderThatWasMoved)
     {
         //[UserSliderCode_out_pitch_bend_range] -- add your slider handling code here..
         if (processor != NULL)
-            processor->out_pitch_bend_range = sliderThatWasMoved->getValue();
+            *(processor->out_pitch_bend_range) = sliderThatWasMoved->getValue();
         //[/UserSliderCode_out_pitch_bend_range]
     }
 
@@ -173,8 +188,9 @@ BEGIN_JUCER_METADATA
                  variableInitialisers="" snapPixels="8" snapActive="1" snapShown="1"
                  overlayOpacity="0.330" fixedSize="1" initialWidth="1000" initialHeight="400">
   <BACKGROUND backgroundColour="ff323e44">
-    <RECT pos="183 0 1 80%" fill="solid: ffb6b6b6" hasStroke="0"/>
-    <RECT pos="815 1 1 80%" fill="solid: ffb6b6b6" hasStroke="0"/>
+    <RECT pos="20% 0 1 80%" fill="solid: ffb6b6b6" hasStroke="0"/>
+    <RECT pos="80% 1 1 80%" fill="solid: ffb6b6b6" hasStroke="0"/>
+    <RECT pos="40% 0 1 80%" fill="solid: ffb6b6b6" hasStroke="0"/>
   </BACKGROUND>
   <JUCERCOMP name="" id="9a893a36dc7e0c36" memberName="keyboardVisual" virtualName=""
              explicitFocusOrder="0" pos="0 0Rr 100% 20%" sourceFile="EditorModules/KeyboardVisual.cpp"
@@ -185,8 +201,8 @@ BEGIN_JUCER_METADATA
              posRelativeH="9a893a36dc7e0c36" sourceFile="EditorModules/ScaleFrequenciesOverlay.cpp"
              constructorParams="keyboardVisual.get(), processor"/>
   <SLIDER name="new slider" id="e3a72a963cc8c6fa" memberName="out_pitch_bend_range"
-          virtualName="" explicitFocusOrder="0" pos="840 152 150 24" min="0.0"
-          max="48.0" int="1.0" style="IncDecButtons" textBoxPos="TextBoxLeft"
+          virtualName="" explicitFocusOrder="0" pos="840 152 150 24" min="1.0"
+          max="96.0" int="1.0" style="IncDecButtons" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
   <LABEL name="new label" id="1ac3af9fe857753" memberName="label" virtualName=""
@@ -201,11 +217,14 @@ BEGIN_JUCER_METADATA
              posRelativeH="9a893a36dc7e0c36" sourceFile="EditorModules/NoteAndFrequencyOverlay.cpp"
              constructorParams="keyboardVisual.get(), processor"/>
   <JUCERCOMP name="" id="718dd2c51df8bc00" memberName="component" virtualName=""
-             explicitFocusOrder="0" pos="0 0 176 80%" sourceFile="EditorModules/InputModule.cpp"
+             explicitFocusOrder="0" pos="0 0 20% 80%" sourceFile="EditorModules/InputModule.cpp"
              constructorParams="processor"/>
   <JUCERCOMP name="" id="362421b4abac7430" memberName="component2" virtualName=""
-             explicitFocusOrder="0" pos="20% 0 60% 80%" sourceFile="EditorModules/ScaleEditor.cpp"
+             explicitFocusOrder="0" pos="20% 0 20% 80%" sourceFile="EditorModules/ScaleEditor.cpp"
              constructorParams="processor"/>
+  <JUCERCOMP name="" id="3e17f48e254318d" memberName="conversionModule" virtualName=""
+             explicitFocusOrder="0" pos="40% 0 40% 80%" sourceFile="EditorModules/ConversionModule.cpp"
+             constructorParams=""/>
 </JUCER_COMPONENT>
 
 END_JUCER_METADATA
diff --git a/Source/PluginGUI.h b/Source/PluginGUI.h
index d8954d6..f4d4bfb 100644
--- a/Source/PluginGUI.h
+++ b/Source/PluginGUI.h
@@ -29,6 +29,7 @@
 #include "EditorModules/NoteAndFrequencyOverlay.h"
 #include "EditorModules/InputModule.h"
 #include "EditorModules/ScaleEditor.h"
+#include "EditorModules/ConversionModule.h"
 
 
 //==============================================================================
@@ -70,6 +71,7 @@ class PluginGUI  : public Component,
     std::unique_ptr<NoteAndFrequencyOverlay> noteAndFreqOverlay;
     std::unique_ptr<InputModule> component;
     std::unique_ptr<ScaleEditor> component2;
+    std::unique_ptr<ConversionModule> conversionModule;
 
 
     //==============================================================================
diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
index 633a19a..85aa79d 100644
--- a/Source/PluginProcessor.cpp
+++ b/Source/PluginProcessor.cpp
@@ -27,6 +27,14 @@ XenMidiRetunerAudioProcessor::XenMidiRetunerAudioProcessor()
                        )
 #endif
 {
+    addParameter(in_pitch_bend_range = new AudioParameterInt("in_pitch_bend_range", "Input Pitch Bend Range", 1, 96, 48));
+    addParameter(out_pitch_bend_range = new AudioParameterInt("out_pitch_bend_range", "Output Pitch Bend Range", 1, 96, 48));
+    
+    addParameter(singleChannelNotePriority = new AudioParameterChoice("singleChannelNotePriority", "Single Channel Note Priority", {
+        "Note", "Velocity", "Random"
+    }, 0));
+    addParameter(singleChannelNotePriorityModifier = new AudioParameterChoice("singleChannelNotePriorityModifier", "Single Channel Note Priority Modifier", {"Most Recent", "Oldest", "Greatest", "Lowest"}, 0));
+    
 //    scale = TUN::CSingleScale();
 }
 
@@ -144,10 +152,12 @@ const Note* getPriorityNote(const std::vector<Note>& noteStack, SingleChannelNot
             switch (priorityModifier)
             {
                 case MOST_RECENT:
-                    thePriorityNote = &noteStack.back();
+                    if (!noteStack.empty())
+                        thePriorityNote = &noteStack.back();
                     break;
                 case FIRST:
-                    thePriorityNote = &noteStack.front();
+                    if (!noteStack.empty())
+                        thePriorityNote = &noteStack.front();
                     break;
                 case HIGHEST_NOTE: {
                     uint8_t highestNoteVal = 0;
@@ -190,6 +200,7 @@ const Note* getPriorityNote(const std::vector<Note>& noteStack, SingleChannelNot
 
 void XenMidiRetunerAudioProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& midiMessages)
 {
+    // TODO: FIXME:  Paramemters that are adjusted by outside classes can be adjusted during processBlock, therefore calculations can change midway through.  Store paramemters in a temporarily variable so paramemters do not change throughout.
     buffer.clear();
 
     MidiBuffer processedMidi;
@@ -200,6 +211,7 @@ void XenMidiRetunerAudioProcessor::processBlock (AudioBuffer<float>& buffer, Mid
     for (MidiBuffer::Iterator i (midiMessages); i.getNextEvent (m, time);)
     {
         bool update = false;
+        bool updateInitalNotes = false;
         
         // STACK CREATION
         // Pack all information into a Channel array with Note vectors for ease of interpretation later
@@ -212,109 +224,197 @@ void XenMidiRetunerAudioProcessor::processBlock (AudioBuffer<float>& buffer, Mid
             //      and therefore may TODO: require note updates if perceived frequency is greater than output pitch range
             input[channel].pitchwheel = m.getPitchWheelValue();
             
-            /*
-            std::vector<Note> currentNotes = input[channel].notes;
-            for (std::vector<Note>::iterator it = currentNotes.begin(); it != currentNotes.end(); ++it) {
-                it->convertedFrequency = noteAndSemitonesToFreqHz(it->midiNote, pitchwheelPosToSemitones(input[channel].pitchwheel, in_pitch_bend_range));
-            }
-             */
-            
             // DOES Not update note prioritzation
-            // Though, it does change input frequencies, therefore has an effect on interpretation and scale interploation
-            update = true;
-        }
-        if (m.isNoteOn())
+            // It does change input frequencies, therefore has an effect on interpretation and scale interploation
+            // Though, if no notes are playing (priorityNote is null), it cannot update any information regarding converted notes
+            if (input[channel].priorityNote != nullptr)
+            {
+                update = true;
+            }
+        } else if (m.isNoteOn())
         {
-            // Add the new, played midi note.
-            // First remove midi note if the note already exists (which is important for time-based prioritization)...
-            std::vector<Note> currentNotes = input[channel].notes;
-            for (std::vector<Note>::iterator it = currentNotes.begin(); it != currentNotes.end(); ++it) {
-                if (it->midiNote == m.getNoteNumber()) {
-                    it = currentNotes.erase(it);
-                    break;
+            {
+                // Lock the input channel array
+                const ScopedLock myScopedLock (inputLock);
+                
+                // Add the new, played midi note.
+                // First remove midi note if the note already exists (which is important for time-based prioritization)...
+                std::vector<Note> currentNotes = input[channel].notes;
+                for (std::vector<Note>::iterator it = currentNotes.begin(); it != currentNotes.end(); ++it) {
+                    if (it->midiNote == m.getNoteNumber()) {
+                        it = currentNotes.erase(it);
+                        break;
+                    }
                 }
+                
+                // Then, Add the newest note to the end of the stack (append to last element of vector)
+                Note newNote = Note {
+                    m.getNoteNumber(),
+                    m.getVelocity()
+                };
+                currentNotes.push_back(newNote);
+                input[channel].notes = currentNotes;
             }
             
-            // Then, Add the newest note to the end of the stack (append to last element of vector)
-            currentNotes.push_back(Note {
-                m.getNoteNumber(),
-                m.getVelocity()/*,
-                noteAndSemitonesToFreqHz(m.getNoteNumber(), pitchwheelPosToSemitones(input[channel].pitchwheel, in_pitch_bend_range)) */
-            });
-            input[channel].notes = currentNotes;
-            
-            // This condition updates prioritization
-            input[channel].priorityNote = getPriorityNote(input[channel].notes, singleChannelNotePriority, singleChannelNotePriorityModifier);
+            // This condition of note on updates prioritization
+            input[channel].priorityNote = getPriorityNote(input[channel].notes, (SingleChannelNotePrioritzation)singleChannelNotePriority->getIndex(), (SingleChannelNotePrioritzationModifier)singleChannelNotePriorityModifier->getIndex());
             
             // Update scale interpretation
             update = true;
-        }
-        if (m.isNoteOff())
+            // ... and updates what the inital notes are
+            updateInitalNotes = true;
+            
+        } else if (m.isNoteOff())
         {
-            // Remove the note that was called to be off from the stack
-            std::vector<Note> currentNotes = input[channel].notes;
-            for (std::vector<Note>::iterator it = currentNotes.begin(); it != currentNotes.end(); ++it) {
-                if (it->midiNote == m.getNoteNumber()) {
-                    it = currentNotes.erase(it);
-                    break;
+            {
+                // Lock the input channel array
+                const ScopedLock myScopedLock (inputLock);
+                
+                // Remove the note that was called to be off from the stack
+                std::vector<Note> currentNotes = input[channel].notes;
+                for (std::vector<Note>::iterator it = currentNotes.begin(); it != currentNotes.end(); ++it) {
+                    if (it->midiNote == m.getNoteNumber()) {
+                        it = currentNotes.erase(it);
+                        break;
+                    }
                 }
+                input[channel].notes = currentNotes;
             }
-            input[channel].notes = currentNotes;
             
-            // This condition updates prioritization
-            input[channel].priorityNote = getPriorityNote(input[channel].notes, singleChannelNotePriority, singleChannelNotePriorityModifier);
+            // This condition of note off updates prioritization
+            // Prioirty Note should be set to nullptr if there are no notes to choose from
+            input[channel].priorityNote = getPriorityNote(input[channel].notes, (SingleChannelNotePrioritzation)singleChannelNotePriority->getIndex(), (SingleChannelNotePrioritzationModifier)singleChannelNotePriorityModifier->getIndex());
             
-            // Update scale interpretation
-            update = true;
-        }
-        
-        // Interpretate and convert played notes of the current channel into the tuned value
-        if (update)
-        {
+            if (input[channel].priorityNote != nullptr)
+            {
+                // Update scale interpretation
+                update = true;
+                // ... and updates what the inital notes are
+                updateInitalNotes = true;
+            }
             
-        }
-        
-        /*
-        // Find out where the current note lays in regards to the scale
-        float inputFrequency = noteAndSemitonesToFreqHz(input[channel].priorityNote->midiNote, pitchwheelPosToSemitones(input[channel].pitchwheel, in_pitch_bend_range));
-        
-        // TODO: REVIEW: There must be a more efficent way to find where a note lies in a vector of scale frequencies
-        double lowerScaleNote;
-        double higherScaleNote;
-        bool found = false;
-        for (auto it = scale.GetNoteFrequenciesHz().begin(); it != scale.GetNoteFrequenciesHz().end() - 1; ++it) {
-            auto next = std::next(it);
-            if (inputFrequency > *it && inputFrequency < *next)
+            // If all input is empty, therefore nothing should be playing.  Ensure all notes on output are set to off.
+            // Priority Note will be nullptr as well, either because there is no notes to choose from, due to a prioirty function not being implemented, or having edge cases.
+            // Its best to use empty() instead of if == nullptr because of those last two reasons.
+            if (input[channel].notes.empty())
             {
-                lowerScaleNote = *it;
-                higherScaleNote = *next;
-                found = true;
-                break;
+                // Iterate through all notes and find all the notes ready for turn off
+                for (std::vector<Note>::iterator it = outputNotes[channel].begin(); it != outputNotes[channel].end(); ++it) {
+                    processedMidi.addEvent(MidiMessage::noteOff(m.getChannel(), it->midiNote), time);
+                }
+                
+                outputNotes[channel].clear();
             }
         }
         
-        if (found)
+        // Interpretate and convert played notes of the current channel into the tuned value
+        // Will not run if there are no more notes in the stack
+        if (update)
         {
-            float lowerContMidiNote = 0.0f;
-            float higherContMidiNote = 0.0f;
-            int noteNum;
-            double semitones;
+            float prioritySemitones = pitchwheelPosToSemitones(input[channel].pitchwheel, in_pitch_bend_range->get());
+            // FIXME:  Created Segmentation Fault
+            float priorityNoteFreq = noteAndSemitonesToFreqHz(input[channel].priorityNote->midiNote, prioritySemitones);
             
-            // Convert scale frequencies to continuous midi notes
-            freqHZToNoteAndSemitones(lowerScaleNote, noteNum, semitones);
-            lowerContMidiNote = noteNum + semitones;
-            freqHZToNoteAndSemitones(higherScaleNote, noteNum, semitones);
-            higherContMidiNote = noteNum + semitones;
+            double lowerScaleNoteFreq;
+            double higherScaleNoteFreq;
             
-            // Convert range of lower and upper scale midi note to range of 0.0 - 1.0
-            float inputInRange = juce::jmap(inputFrequency, lowerContMidiNote, higherContMidiNote, 0.0f, 1.0f);
+            // FIXME: Finding the nearest two scale note frequencies assumes the scale increases in a sorted order.  Some scales may not follow this paradigm!
+            for (auto it = scale.GetNoteFrequenciesHz().begin(); it != scale.GetNoteFrequenciesHz().end(); ++it)
+            {
+                auto nextIt = std::next(it);
+                if (priorityNoteFreq >= *it && priorityNoteFreq < *nextIt)
+                {
+                    lowerScaleNoteFreq = *it;
+                    higherScaleNoteFreq = *nextIt;
+                    break;
+                }
+            }
             
-            // Round range to find note to snap to
-            int note = std::round(inputInRange);
+            // FIXME:  AAHHHHHHHHHH!!!! UPDATING WONT EVEN WORK UNTIL THE GUI IS FIRST OPENED NONONOONONNO!111!!!!1
+            if (interpolationCurve != nullptr)
+            {
+                // TODO: Have different interpolation dimensions (i.e. frequency or midi note (cents)).  Interpolation dimension currently is cents.
+                float priorityContMidiNote = input[channel].priorityNote->midiNote + prioritySemitones;
+                float lowerContMidiNote = 0.0f;
+                float higherContMidiNote = 0.0f;
+                int noteNum;
+                double semitones;
+                
+                freqHZToNoteAndSemitones(lowerScaleNoteFreq, noteNum, semitones);
+                lowerContMidiNote = noteNum + semitones;
+                freqHZToNoteAndSemitones(higherScaleNoteFreq, noteNum, semitones);
+                higherContMidiNote = noteNum + semitones;
+                
+                float percentBetween = jmap(priorityContMidiNote, lowerContMidiNote, higherContMidiNote, 0.0f, 1.0f);
+                float interpolatedBetween = interpolationCurve->evaluate(percentBetween);
+                float mappedBackToContinuousMidiNote = jmap(interpolatedBetween, 0.0f, 1.0f, lowerContMidiNote, higherContMidiNote);
+                
+                // For this channel, this is the target continuous midi note that the priority note needs to reach
+                input[channel].scaleConvertedPriorityNote = mappedBackToContinuousMidiNote;
+                
+                
+                if (updateInitalNotes)
+                {
+                    output[channel].initalMidiNote = std::round(input[channel].scaleConvertedPriorityNote);
+                    output[channel].initalJump = output[channel].initalMidiNote - input[channel].priorityNote->midiNote;
+                }
+                
+                output[channel].noteOffset = std::round((input[channel].scaleConvertedPriorityNote - output[channel].initalMidiNote) / (out_pitch_bend_range->get() * 2)) * (out_pitch_bend_range->get() * 2);
+                output[channel].currentMidiNoteNumber = output[channel].noteOffset + output[channel].initalMidiNote;
+                
+                // Set all notes for removal.  The next loop will re-set notes to stay on if input midi calls for it
+                int amountMarkedForRemoval = static_cast<int>(outputNotes[channel].size());
+                for (std::vector<Note>::iterator it = outputNotes[channel].begin(); it != outputNotes[channel].end(); ++it) {
+                    it->turnOffFlag = true;
+                }
+                
+                for (std::vector<Note>::iterator it = input[channel].notes.begin(); it != input[channel].notes.end(); ++it) {
+                    int inputMidiNoteAdjusted = it->midiNote + output[channel].initalJump + output[channel].noteOffset;
+                    
+                    bool noteAlreadyExists = false;
+                    for (std::vector<Note>::iterator it = outputNotes[channel].begin(); it != outputNotes[channel].end(); ++it) {
+                        if (it->midiNote == inputMidiNoteAdjusted) {
+                            // Note already exists.  Make sure it stays for next update and is not removed.
+                            it->turnOffFlag = false;
+                            amountMarkedForRemoval--;
+                            noteAlreadyExists = true;
+                            break;
+                        }
+                    }
+                    
+                    if (!noteAlreadyExists)
+                    {
+                        Note currentConvertedNote = *it;
+                        currentConvertedNote.midiNote = inputMidiNoteAdjusted;
+                        
+                        // If this is the first time adding this note, turn it on.
+                        outputNotes[channel].push_back(currentConvertedNote);
+                        
+                        processedMidi.addEvent(MidiMessage::noteOn(m.getChannel(), inputMidiNoteAdjusted, it->velocity), time);
+                    }
+                }
+                
+                // Iterate through all notes and find all the notes ready for turn off
+                for (int i = 0; i < amountMarkedForRemoval; i++) {
+                    for (std::vector<Note>::iterator it = outputNotes[channel].begin(); it != outputNotes[channel].end(); ++it) {
+                        if (it->turnOffFlag) {
+                            processedMidi.addEvent(MidiMessage::noteOff(m.getChannel(), it->midiNote), time);
+                            it = outputNotes[channel].erase(it);
+                            // Cannot erase and then continue for loop.  Therefore, restart loop for as many times there are elements (notes) to remove
+                            break;
+                        }
+                    }
+                }
+                
+                // Destination - source
+                float semitonesAdjust = input[channel].scaleConvertedPriorityNote - (input[channel].priorityNote->midiNote + output[channel].initalJump + output[channel].noteOffset);
+                uint16 pitchWheel = MidiMessage::pitchbendToPitchwheelPos(semitonesAdjust, out_pitch_bend_range->get());
+                
+                processedMidi.addEvent(MidiMessage::pitchWheel(m.getChannel(), pitchWheel), time);
+            }
         }
-        */
 
-        processedMidi.addEvent(m, time);
+        // processedMidi.addEvent(m, time);
         // processedMidi.addEvent(MidiMessage::pitchWheel(m.getChannel(), random(0,16383)), time);
         // processedMidi.addEvent(MidiMessage::noteOn(m.getChannel(), random(0,100), (uint8)random(0,100)), time);
     }
@@ -339,12 +439,49 @@ void XenMidiRetunerAudioProcessor::getStateInformation (MemoryBlock& destData)
     // You should use this method to store your parameters in the memory block.
     // You could do that either as raw data, or use the XML or ValueTree classes
     // as intermediaries to make it easy to save and load complex data.
+    
+    // TODO: Make xml setAttributes "dynamic", where an array of AudioProcessorAttrubute pointers are iterated over and saved
+    std::unique_ptr<XmlElement> xml (new XmlElement ("XenMIDIRetuner"));
+    xml->setAttribute("save_version", "0.0.1");
+    
+    xml->setAttribute ("in_pitch_bend_range", *in_pitch_bend_range);
+    xml->setAttribute("out_pitch_bend_range", *out_pitch_bend_range);
+    xml->setAttribute("singleChannelNotePriority", singleChannelNotePriority->getIndex());
+    xml->setAttribute("singleChannelNotePriorityModifier", singleChannelNotePriorityModifier->getIndex());
+    
+    std::ostringstream stream;
+    scale.Write(stream);
+    std::string str = stream.str();
+    xml->setAttribute("scale_file", str);
+    
+    copyXmlToBinary (*xml, destData);
 }
 
 void XenMidiRetunerAudioProcessor::setStateInformation (const void* data, int sizeInBytes)
 {
     // You should use this method to restore your parameters from this memory block,
     // whose contents will have been created by the getStateInformation() call.
+    
+    std::unique_ptr<XmlElement> xmlState (getXmlFromBinary (data, sizeInBytes));
+ 
+    if (xmlState.get() != nullptr) {
+        if (xmlState->hasTagName ("XenMIDIRetuner")) {
+            *in_pitch_bend_range = xmlState->getIntAttribute("in_pitch_bend_range", 48);
+            *out_pitch_bend_range = xmlState->getIntAttribute("out_pitch_bend_range", 48);
+            *singleChannelNotePriority = xmlState->getIntAttribute("singleChannelNotePriority", 0);
+            *singleChannelNotePriorityModifier = xmlState->getIntAttribute("singleChannelNotePriorityModifier", 0);
+            
+            std::string scaleString = xmlState->getStringAttribute("scale_file").toStdString();
+            std::istringstream scaleStringStream(scaleString);
+            
+            // String which will receive the current line from the file
+            TUN::CStringParser    strparser;
+            strparser.InitStreamReading();
+
+            // Read the file
+            long lResult = scale.Read(scaleStringStream, strparser);
+        }
+    }
 }
 
 //==============================================================================
diff --git a/Source/PluginProcessor.h b/Source/PluginProcessor.h
index 7e331fe..6996b3a 100644
--- a/Source/PluginProcessor.h
+++ b/Source/PluginProcessor.h
@@ -12,6 +12,7 @@
 
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "AnaMark-Tuning-Library/SCL_Import.h"
+#include "EditorModules/Components/TransitionCurve.h"
 
 //==============================================================================
 /**
@@ -43,20 +44,27 @@ enum InterpolationDimension
 struct Note
 {
     int midiNote;
-    int velocity;
+    uint8 velocity;
+    
+    bool turnOffFlag = false;
 };
 
 struct Channel
 {
     uint16 pitchwheel = CENTER_PITCHWHEEL; // Default to pitchbend wheel at center
     const Note *priorityNote;
+    
+    float scaleConvertedPriorityNote;
     std::vector<Note> notes;
 };
 
 struct OutputChannel
 {
-    Channel *inputChannel;
+    int initalMidiNote;
+    int initalJump;
     
+    int noteOffset;
+    int currentMidiNoteNumber;
 };
 
 class XenMidiRetunerAudioProcessor  : public AudioProcessor
@@ -64,16 +72,22 @@ class XenMidiRetunerAudioProcessor  : public AudioProcessor
 public:
     // Processor data
     Channel input[MAX_MIDI_CHANNELS];
+    CriticalSection inputLock;
+    
     OutputChannel output[MAX_MIDI_CHANNELS];
+    std::vector<Note> outputNotes[MAX_MIDI_CHANNELS];
 
     TUN::CSingleScale scale;
 
-    int in_pitch_bend_range;
-    int out_pitch_bend_range;
+    AudioParameterInt *in_pitch_bend_range;
+    AudioParameterInt *out_pitch_bend_range;
+    
+    AudioParameterChoice *singleChannelNotePriority;
+    AudioParameterChoice *singleChannelNotePriorityModifier;
     
-    SingleChannelNotePrioritzation singleChannelNotePriority = NOTE;
-    SingleChannelNotePrioritzationModifier singleChannelNotePriorityModifier = MOST_RECENT;
     InterpolationDimension interploationDimension = CENTS;
+    
+    TransitionCurve *interpolationCurve = nullptr;
     // END Processor data
 
     //==============================================================================
@@ -114,6 +128,7 @@ class XenMidiRetunerAudioProcessor  : public AudioProcessor
     void setStateInformation (const void* data, int sizeInBytes) override;
 
 private:
+    
     //==============================================================================
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (XenMidiRetunerAudioProcessor)
 };
diff --git a/Source/Utilities.cpp b/Source/Utilities.cpp
index 616945c..c060bd6 100644
--- a/Source/Utilities.cpp
+++ b/Source/Utilities.cpp
@@ -21,6 +21,11 @@ float noteAndSemitonesToFreqHz(int noteNum, float semitones)
     return std::pow(2, ((noteNum + semitones) - 69) / 12.0f) * 440;
 }
 
+float continuousNoteToFreqHz(float continuousNote)
+{
+    return std::pow(2, ((continuousNote) - 69) / 12.0f) * 440;
+}
+
 void freqHZToNoteAndSemitones(double frequency, int &noteNum, double &semitones)
 {
   // Convert frequency to the midi note number with decimal result kept
diff --git a/Source/Utilities.h b/Source/Utilities.h
index ba87f39..13ce988 100644
--- a/Source/Utilities.h
+++ b/Source/Utilities.h
@@ -15,6 +15,7 @@
 float pitchwheelPosToSemitones(const uint16 pitchwheelPos, const float pitchbendRange);
 
 float noteAndSemitonesToFreqHz(int noteNum, float semitones);
+float continuousNoteToFreqHz(float continuousNote);
 void freqHZToNoteAndSemitones(double frequency, int &noteNum, double &semitones);
 
 int random(int min, int max);
diff --git a/Xen MIDI Retuner.jucer b/Xen MIDI Retuner.jucer
index 1d52913..31001c6 100644
--- a/Xen MIDI Retuner.jucer	
+++ b/Xen MIDI Retuner.jucer	
@@ -4,7 +4,7 @@
               pluginFormats="buildAU,buildVST" pluginCharacteristicsValue="pluginEditorRequiresKeys,pluginIsSynth,pluginProducesMidiOut,pluginWantsMidiIn"
               pluginVST3Category="Fx,Tools" bundleIdentifier="com.TarasPalczynskiIII.XenMIDIRetuner"
               companyName="Taras Palczynski III" pluginManufacturer="Taras Palczynski III"
-              pluginName="Xen MIDI Retuner">
+              pluginName="Xen MIDI Retuner" version="0.0.1">
   <MAINGROUP id="dJj14n" name="Xen MIDI Retuner">
     <GROUP id="{A1692F2F-028C-9EA8-2739-2FC33C9F86F6}" name="Source">
       <GROUP id="{5CFBB6E8-DB93-CA08-FB77-07FAC1572B4B}" name="AnaMark-Tuning-Library">
@@ -28,6 +28,16 @@
               file="Source/AnaMark-Tuning-Library/TUN_StringTools.h"/>
       </GROUP>
       <GROUP id="{6E9FE505-8222-C370-9837-85B2A5A04EF8}" name="EditorModules">
+        <GROUP id="{B7E7302D-0FC2-70B0-B744-AC0BE6319EE2}" name="Components">
+          <FILE id="Ic9glx" name="TransitionCurve.cpp" compile="1" resource="0"
+                file="Source/EditorModules/Components/TransitionCurve.cpp"/>
+          <FILE id="oLc1Lc" name="TransitionCurve.h" compile="0" resource="0"
+                file="Source/EditorModules/Components/TransitionCurve.h"/>
+        </GROUP>
+        <FILE id="OQtVW9" name="ConversionModule.cpp" compile="1" resource="0"
+              file="Source/EditorModules/ConversionModule.cpp"/>
+        <FILE id="UzvsFz" name="ConversionModule.h" compile="0" resource="0"
+              file="Source/EditorModules/ConversionModule.h"/>
         <FILE id="QSLdoB" name="InputModule.cpp" compile="1" resource="0" file="Source/EditorModules/InputModule.cpp"/>
         <FILE id="tGJlgF" name="InputModule.h" compile="0" resource="0" file="Source/EditorModules/InputModule.h"/>
         <FILE id="S5xF8B" name="KeyboardVisual.cpp" compile="1" resource="0"