diff --git a/.gitignore b/.gitignore
index 156912e4..1299bd6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 *.DS_Store
 /Installers/InnoSetup/vc_redist.x64.exe
 /Installers/InnoSetup/Install*
+/Installers/InnoSetup/archive*
 /Installers/Packages/build*
diff --git a/Libraries/mac/lib/libssh2.1.dylib b/Libraries/mac/lib/libssh2.1.dylib
index d0640c13..581001fc 100755
Binary files a/Libraries/mac/lib/libssh2.1.dylib and b/Libraries/mac/lib/libssh2.1.dylib differ
diff --git a/Source/AllKeysOverview.cpp b/Source/AllKeysOverview.cpp
index 2e49aaaf..3b6cc172 100644
--- a/Source/AllKeysOverview.cpp
+++ b/Source/AllKeysOverview.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.5
+  Created with Projucer version: 6.0.8
 
   ------------------------------------------------------------------------------
 
@@ -40,12 +40,12 @@ KeyMiniDisplayInsideAllKeysOverview::KeyMiniDisplayInsideAllKeysOverview(int new
 	boardIndex = newBoardIndex;
 	keyIndex = newKeyIndex;
 
-	TerpstraSysExApplication::getApp().getMidiDriver().addListener(this);
+	TerpstraSysExApplication::getApp().getLumatoneController().addMidiListener(this);
 }
 
 KeyMiniDisplayInsideAllKeysOverview::~KeyMiniDisplayInsideAllKeysOverview()
 {
-	TerpstraSysExApplication::getApp().getMidiDriver().removeListener(this);
+	TerpstraSysExApplication::getApp().getLumatoneController().removeMidiListener(this);
 }
 
 void KeyMiniDisplayInsideAllKeysOverview::paint(Graphics& g)
@@ -56,7 +56,7 @@ void KeyMiniDisplayInsideAllKeysOverview::paint(Graphics& g)
 	Colour hexagonColour = findColour(TerpstraKeyEdit::backgroundColourId).overlaidWith(getKeyColour());
     if (hexagonColour.getPerceivedBrightness() >= 0.6)
         hexagonColour = hexagonColour.darker((1.0 - hexagonColour.getPerceivedBrightness()));
-    
+
     g.setColour(hexagonColour);
 
 	if (colourGraphic && shadowGraphic)
@@ -89,29 +89,28 @@ void KeyMiniDisplayInsideAllKeysOverview::mouseDown(const MouseEvent& e)
 
 	if (e.mods.isRightButtonDown())
 	{
-		// Right mosue click: popup menu
+		// Right mouse click: popup menu
 		PopupMenu menu;
-
-		menu.addCommandItem(TerpstraSysExApplication::getApp().getCommandManager(), Lumatone::Menu::commandIDs::deleteOctaveBoard);
-		menu.addCommandItem(TerpstraSysExApplication::getApp().getCommandManager(), Lumatone::Menu::commandIDs::copyOctaveBoard);
-		menu.addCommandItem(TerpstraSysExApplication::getApp().getCommandManager(), Lumatone::Menu::commandIDs::pasteOctaveBoard);
-		
+		TerpstraSysExApplication::getApp().getMainMenu()->createEditMenu(menu);
 		menu.show();
 	}
-	else
-	{
-		// NoteOn MIDI message
-		auto keyData = getKeyData();
-		if (keyData != nullptr && keyData->channelNumber > 0)
-		{
-			if (keyData->keyType == TerpstraKey::noteOnNoteOff)
-			{
-				// Send "note on" event
-				TerpstraSysExApplication::getApp().getMidiDriver().sendNoteOnMessage(keyData->noteNumber, keyData->channelNumber, 60);
-			}
-			// ToDo if keyType is "continuous controller": send controller event?
-		}
-	}
+
+	// TODO integrate interaction through LumatoneController
+
+	//else
+	//{
+	//	// NoteOn MIDI message
+	//	auto keyData = getKeyData();
+	//	if (keyData != nullptr && keyData->channelNumber > 0)
+	//	{
+	//		if (keyData->keyType == LumatoneKeyType::noteOnNoteOff)
+	//		{
+	//			// Send "note on" event
+	//			//TerpstraSysExApplication::getApp().getMidiDriver().sendNoteOnMessage(keyData->noteNumber, keyData->channelNumber, 60);
+	//		}
+	//		// ToDo if keyType is "continuous controller": send controller event?
+	//	}
+	//}
 }
 
 void KeyMiniDisplayInsideAllKeysOverview::mouseUp(const MouseEvent& e)
@@ -121,29 +120,27 @@ void KeyMiniDisplayInsideAllKeysOverview::mouseUp(const MouseEvent& e)
 	isHighlighted = false;
 	repaint();
 
-	// NoteOff MIDI message
-	auto keyData = getKeyData();
-	if (keyData != nullptr && keyData->channelNumber > 0)
-	{
-		if (keyData->keyType == TerpstraKey::noteOnNoteOff)
-		{
-			// Send "note off" event
-			TerpstraSysExApplication::getApp().getMidiDriver().sendNoteOffMessage(keyData->noteNumber, keyData->channelNumber, 60);
-		}
-	}
+	// TODO integrate interaction through LumatoneController
+
+	//// NoteOff MIDI message
+	//auto keyData = getKeyData();
+	//if (keyData != nullptr && keyData->channelNumber > 0)
+	//{
+	//	if (keyData->keyType == TerpstraKey::noteOnNoteOff)
+	//	{
+	//		// Send "note off" event
+	//		TerpstraSysExApplication::getApp().getMidiDriver().sendNoteOffMessage(keyData->noteNumber, keyData->channelNumber, 60);
+	//	}
+	//}
 }
 
-void KeyMiniDisplayInsideAllKeysOverview::midiMessageReceived(const MidiMessage& midiMessage)
+void KeyMiniDisplayInsideAllKeysOverview::handleMidiMessage(const MidiMessage& msg)
 {
-	// ToDo If key is parametrized as controller?
-	if (midiMessage.isNoteOnOrOff())
+	auto keyData = getKeyData();
+	if (keyData != nullptr && msg.getChannel() == keyData->channelNumber && msg.getNoteNumber() == keyData->noteNumber)
 	{
-		auto keyData = getKeyData();
-		if (keyData != nullptr && midiMessage.getChannel() == keyData->channelNumber && midiMessage.getNoteNumber() == keyData->noteNumber)
-		{
-			isHighlighted = midiMessage.isNoteOn();
-			repaint();
-		}
+		isHighlighted = msg.isNoteOn();
+		repaint();
 	}
 }
 
@@ -181,59 +178,51 @@ void KeyMiniDisplayInsideAllKeysOverview::setKeyGraphics(Image& colourGraphicIn,
 AllKeysOverview::AllKeysOverview()
 	: Component("AllKeysOverview")
 {
-    //[Constructor_pre] You can add your own custom stuff here..
-    //[/Constructor_pre]
-
-    btnLoadFile.reset (new juce::TextButton ("btnLoadFile"));
-    addAndMakeVisible (btnLoadFile.get());
-
-    btnLoadFile->setButtonText (translate("LoadFile"));
-	btnLoadFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorAssets::LoadIcon);
-    btnLoadFile->addListener (this);
-
-    btnSaveFile.reset (new juce::TextButton ("btnSaveFile"));
-    addAndMakeVisible (btnSaveFile.get());
-    btnSaveFile->setButtonText (translate("SaveFile"));
-	btnSaveFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorAssets::SaveIcon);
-    btnSaveFile->addListener (this);
-
-    buttonReceive.reset (new juce::TextButton ("buttonReceive"));
-    addAndMakeVisible (buttonReceive.get());
-    buttonReceive->setTooltip (translate("ImportTooltip"));
-    buttonReceive->setButtonText (translate("Import from Lumatone"));
-	buttonReceive->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorAssets::ImportIcon);
+	//[Constructor_pre] You can add your own custom stuff here..
+	//[/Constructor_pre]
+
+	btnLoadFile.reset(new juce::TextButton("btnLoadFile"));
+	addAndMakeVisible(btnLoadFile.get());
+
+	btnLoadFile->setButtonText(translate("LoadFile"));
+	btnLoadFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::LoadIcon);
+	btnLoadFile->addListener(this);
+
+	btnSaveFile.reset(new juce::TextButton("btnSaveFile"));
+	addAndMakeVisible(btnSaveFile.get());
+	btnSaveFile->setButtonText(translate("SaveFile"));
+	btnSaveFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::SaveIcon);
+	btnSaveFile->addListener(this);
+
+	buttonReceive.reset(new juce::TextButton("buttonReceive"));
+	addAndMakeVisible(buttonReceive.get());
+	buttonReceive->setTooltip(translate("ImportTooltip"));
+	buttonReceive->setButtonText(translate("Import from Lumatone"));
+	buttonReceive->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::ArrowUp);
 	buttonReceive->getProperties().set(LumatoneEditorStyleIDs::textButtonIconPlacement, LumatoneEditorStyleIDs::TextButtonIconPlacement::RightOfText);
-    buttonReceive->addListener (this);
+	buttonReceive->addListener(this);
 
 	tilingGeometry.setColumnAngle(LUMATONEGRAPHICCOLUMNANGLE);
 	tilingGeometry.setRowAngle(LUMATONEGRAPHICROWANGLE);
 
+
     //[UserPreSize]
 
-    lblFirmwareVersion.reset(new Label("FirmwareVersionLabel"));
-    addChildComponent(lblFirmwareVersion.get());
-    
-    for (int subBoardIndex = 0; subBoardIndex < NUMBEROFBOARDS; subBoardIndex++)
-	{
-		OctaveBoard* board = octaveBoards.add(new OctaveBoard());
+	lblFirmwareVersion.reset(new Label("FirmwareVersionLabel"));
+	addChildComponent(lblFirmwareVersion.get());
 
-		for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
-		{
-			auto key = board->keyMiniDisplay.add(new KeyMiniDisplayInsideAllKeysOverview(subBoardIndex, keyIndex));
-			addAndMakeVisible(key);
-		}
+	TerpstraSysExApplication::getApp().getLumatoneController().addFirmwareListener(this);
 
-		jassert(board->keyMiniDisplay.size() == TerpstraSysExApplication::getApp().getOctaveBoardSize());
-	}
+	resetOctaveSize();
 
-	jassert(octaveBoards.size() == NUMBEROFBOARDS);
-    
     //[/UserPreSize]
 
+    setSize (928, 214);
+
 
     //[Constructor] You can add your own custom stuff here..
 	currentSetSelection = -1;
-    
+
     showDeveloperMode(TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("DeveloperMode", false));
     //[/Constructor]
 }
@@ -281,6 +270,9 @@ void AllKeysOverview::paint (juce::Graphics& g)
 void AllKeysOverview::resized()
 {
     //[UserPreResize] Add your own custom resize code here..
+    //[/UserPreResize]
+
+    //[UserResized] Add your own custom resize handling here..
 
 	// Prepare position helpers for graphics
 	int graphicHeight = roundToInt(getHeight() * imageHeight);
@@ -295,7 +287,7 @@ void AllKeysOverview::resized()
 	int btnMargin = round(getWidth() * saveloadMarginW);
 	int saveLoadWidth = round(getWidth() * saveLoadW);
 	int btnY = lumatoneBounds.getY() - round(getHeight() * btnYFromImageTop);
-	
+
 	int halfWidthX = round(getWidth() * 0.5f);
 
 	btnLoadFile->setBounds(halfWidthX - btnMargin - saveLoadWidth, btnY, saveLoadWidth, btnHeight);
@@ -306,9 +298,9 @@ void AllKeysOverview::resized()
 	int importY = lumatoneBounds.getY() - round(getHeight() * importYFromImageTop);
 	int importWidth = round(getWidth() * importW);
 	buttonReceive->setBounds(lumatoneBounds.getRight() - importWidth, importY, importWidth, btnHeight);
-    
-    resizeLabelWithHeight(lblFirmwareVersion.get(), btnHeight * 0.6f);
-    lblFirmwareVersion->setTopLeftPosition(lumatoneBounds.getX(), lumatoneBounds.getY() - btnHeight * 0.6f);
+
+	resizeLabelWithHeight(lblFirmwareVersion.get(), btnHeight * 0.6f);
+	lblFirmwareVersion->setTopLeftPosition(lumatoneBounds.getX(), lumatoneBounds.getY() - btnHeight * 0.6f);
 
 	int keyWidth = round(lumatoneBounds.getWidth() * keyW);
 	int keyHeight = round(lumatoneBounds.getHeight() * keyH);
@@ -317,16 +309,15 @@ void AllKeysOverview::resized()
 	lumatoneGraphic = imageProcessor->resizeImage(ImageCache::getFromHashCode(LumatoneEditorAssets::LumatoneGraphic), lumatoneBounds.getWidth(), lumatoneBounds.getHeight());
 	keyShapeGraphic = imageProcessor->resizeImage(ImageCache::getFromHashCode(LumatoneEditorAssets::KeyShape), keyWidth, keyHeight);
 	keyShadowGraphic = imageProcessor->resizeImage(ImageCache::getFromHashCode(LumatoneEditorAssets::KeyShadow), keyWidth, keyHeight);
-	
-	oct1Key1  = Point<float>(oct1Key1X  * lumatoneBounds.getWidth() + lumatoneBounds.getX(), oct1Key1Y  * lumatoneBounds.getHeight() + lumatoneBounds.getY());
+
+	oct1Key1 = Point<float>(oct1Key1X * lumatoneBounds.getWidth() + lumatoneBounds.getX(), oct1Key1Y * lumatoneBounds.getHeight() + lumatoneBounds.getY());
 	oct1Key56 = Point<float>(oct1Key56X * lumatoneBounds.getWidth() + lumatoneBounds.getX(), oct1Key56Y * lumatoneBounds.getHeight() + lumatoneBounds.getY());
-	oct5Key7  = Point<float>(oct5Key7X  * lumatoneBounds.getWidth() + lumatoneBounds.getX(), oct5Key7Y  * lumatoneBounds.getHeight() + lumatoneBounds.getY());
+	oct5Key7 = Point<float>(oct5Key7X * lumatoneBounds.getWidth() + lumatoneBounds.getX(), oct5Key7Y * lumatoneBounds.getHeight() + lumatoneBounds.getY());
 
 	tilingGeometry.fitSkewedTiling(oct1Key1, oct1Key56, 10, oct5Key7, 24, false);
 
 	Array<Point<float>> keyCentres = tilingGeometry.getHexagonCentresSkewed(boardGeometry, 0, NUMBEROFBOARDS);
 	jassert(keyCentres.size() == TerpstraSysExApplication::getApp().getOctaveBoardSize() * NUMBEROFBOARDS);
-	
 
 	int octaveIndex = 0;
 	octaveBoards[octaveIndex]->leftPos = keyCentres[0].getX() - keyWidth * 0.5;
@@ -337,7 +328,7 @@ void AllKeysOverview::resized()
 
 		// Apply rotational transform
 		Point<int> centre = keyCentres[keyIndex].roundToInt();
-			
+
 		auto key = octaveBoards[octaveIndex]->keyMiniDisplay[keyOctaveIndex];
 		key->setSize(keyWidth, keyHeight);
 		key->setCentrePosition(centre);
@@ -389,39 +380,70 @@ void AllKeysOverview::buttonClicked (juce::Button* buttonThatWasClicked)
 
 //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
 
-void AllKeysOverview::lookAndFeelChanged()
+void AllKeysOverview::setFirmwareVersion(FirmwareVersion versionIn)
 {
-	auto newLookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-	if (newLookAndFeel)
+	if (versionIn.isValid())
 	{
-		newLookAndFeel->setupTextButton(*btnLoadFile);
-		newLookAndFeel->setupTextButton(*btnSaveFile);
-		newLookAndFeel->setupTextButton(*buttonReceive);
-	}
-}
+		if (versionIn.major == 0 && versionIn.minor == 0)
+		{
+			if (versionIn.revision == 55)
+			{
+				lblFirmwareVersion->setText("Prototype 55-keys", NotificationType::dontSendNotification);
+			}
+		}
+		else
+		{
+			lblFirmwareVersion->setText("Firmware version: " + versionIn.toString(), NotificationType::dontSendNotification);
+		}
 
-void AllKeysOverview::setFirmwareVersion(FirmwareVersion versionIn)
-{
-    if (versionIn.isValid())
-    {
-        lblFirmwareVersion->setText("Firmware version: " + versionIn.toString(), NotificationType::dontSendNotification);
-        lblFirmwareVersion->setVisible(true);
-        resized();
-    }
+		lblFirmwareVersion->setVisible(true);
+		resized();
+	}
     else
     {
         lblFirmwareVersion->setVisible(false);
     }
-    
+
     repaint();
 }
 
 void AllKeysOverview::showDeveloperMode(bool developerModeOn)
 {
-    buttonReceive->setVisible(developerModeOn);
     repaint();
 }
 
+void AllKeysOverview::firmwareRevisionReceived(FirmwareVersion version)
+{
+	setFirmwareVersion(version);
+}
+
+void AllKeysOverview::resetOctaveSize()
+{
+	int octaveSize = TerpstraSysExApplication::getApp().getOctaveBoardSize();
+	if (currentOctaveSize != octaveSize)
+	{
+		boardGeometry = TerpstraBoardGeometry();
+		octaveBoards.clear();
+
+		for (int subBoardIndex = 0; subBoardIndex < NUMBEROFBOARDS; subBoardIndex++)
+		{
+			OctaveBoard* board = octaveBoards.add(new OctaveBoard());
+
+			for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
+			{
+				auto key = board->keyMiniDisplay.add(new KeyMiniDisplayInsideAllKeysOverview(subBoardIndex, keyIndex));
+				addAndMakeVisible(key);
+			}
+
+			jassert(board->keyMiniDisplay.size() == octaveSize);
+		}
+
+		currentOctaveSize = octaveSize;
+	}
+
+	jassert(octaveBoards.size() == NUMBEROFBOARDS);
+}
+
 //[/MiscUserCode]
 
 
@@ -435,10 +457,11 @@ void AllKeysOverview::showDeveloperMode(bool developerModeOn)
 BEGIN_JUCER_METADATA
 
 <JUCER_COMPONENT documentType="Component" className="AllKeysOverview" componentName=""
-                 parentClasses="public juce::Component" constructorParams="" variableInitialisers=""
-                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
-                 fixedSize="0" initialWidth="928" initialHeight="214">
-  <BACKGROUND backgroundColour="ff323e44"/>
+                 parentClasses="public juce::Component, public LumatoneController::FirmwareListener"
+                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
+                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="928"
+                 initialHeight="214">
+  <BACKGROUND backgroundColour="0"/>
   <TEXTBUTTON name="btnLoadFile" id="6c0c074c9f137f23" memberName="btnLoadFile"
               virtualName="" explicitFocusOrder="0" pos="368 8 96 24" buttonText="Load File"
               connectedEdges="0" needsCallback="1" radioGroupId="0"/>
diff --git a/Source/AllKeysOverview.h b/Source/AllKeysOverview.h
index 8ae61e92..31ee5975 100644
--- a/Source/AllKeysOverview.h
+++ b/Source/AllKeysOverview.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.5
+  Created with Projucer version: 6.0.8
 
   ------------------------------------------------------------------------------
 
@@ -22,16 +22,16 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "KeyboardDataStructure.h"
+#include "LumatoneController.h"
 #include "HexagonTilingGeometry.h"
 
 #include "ImageResampling/ImageResampler.h"
 #include "BoardGeometry.h"
-#include "TerpstraMidiDriver.h"
+#include "LumatoneController.h"
 
 
 // Representation of a key inside the overview
-class KeyMiniDisplayInsideAllKeysOverview : public Component, public TerpstraMidiDriver::Listener
+class KeyMiniDisplayInsideAllKeysOverview : public Component, public LumatoneController::MidiListener
 {
 public:
 	KeyMiniDisplayInsideAllKeysOverview(int newBoardIndex, int newKeyIndex);
@@ -46,10 +46,11 @@ class KeyMiniDisplayInsideAllKeysOverview : public Component, public TerpstraMid
 	void setKeyGraphics(Image& colourGraphicIn, Image& shadowGraphicIn);
 
 	// Implementation of TerpstraNidiDriver::Listener
-	void midiMessageReceived(const MidiMessage& midiMessage) override;
-	void midiMessageSent(const MidiMessage& midiMessage) override {}
-	void midiSendQueueSize(int queueSize) override {}
-	void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {}
+	//void midiMessageReceived(const MidiMessage& midiMessage) override;
+	//void midiMessageSent(const MidiMessage& midiMessage) override {}
+	//void midiSendQueueSize(int queueSize) override {}
+	//void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {}
+	void handleMidiMessage(const MidiMessage& msg) override;
 
 private:
 	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KeyMiniDisplayInsideAllKeysOverview)
@@ -81,6 +82,7 @@ class KeyMiniDisplayInsideAllKeysOverview : public Component, public TerpstraMid
                                                                     //[/Comments]
 */
 class AllKeysOverview  : public juce::Component,
+                         public LumatoneController::FirmwareListener,
                          public juce::Button::Listener
 {
 public:
@@ -95,18 +97,25 @@ class AllKeysOverview  : public juce::Component,
 	void setCurrentSetSelection(int newSetSelection) { currentSetSelection = newSetSelection; repaint(); }
 
     void showDeveloperMode(bool developerModeOn);
-    
-    void setFirmwareVersion(TerpstraMidiDriver::FirmwareVersion versionIn);
+
+    void setFirmwareVersion(FirmwareVersion versionIn);
+
+	void resetOctaveSize();
+	void firmwareRevisionReceived(FirmwareVersion version) override;
     //[/UserMethods]
 
     void paint (juce::Graphics& g) override;
     void resized() override;
     void buttonClicked (juce::Button* buttonThatWasClicked) override;
 
-	void lookAndFeelChanged() override;
+
 
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
+
+
+private:
+
 	struct OctaveBoard
 	{
 		OwnedArray<KeyMiniDisplayInsideAllKeysOverview>	keyMiniDisplay;
@@ -116,13 +125,14 @@ class AllKeysOverview  : public juce::Component,
 
 	OwnedArray<OctaveBoard> octaveBoards;
 
+	int			currentOctaveSize = 0;
 	int			currentSetSelection;
 
 	HexagonTilingGeometry tilingGeometry;
 
 	Image keyColourLayer;
 	Image keyShadowLayer;
-    
+
     std::unique_ptr<Label> lblFirmwareVersion;
 
 	//==============================================================================
@@ -132,7 +142,7 @@ class AllKeysOverview  : public juce::Component,
 
 	Rectangle<int> lumatoneBounds;
 	int octaveLineY = 0;
-	
+
 	Image lumatoneGraphic;
 	Image keyShapeGraphic;
 	Image keyShadowGraphic;
@@ -159,7 +169,7 @@ class AllKeysOverview  : public juce::Component,
 
 	// In reference to lumatoneBounds
 	const float keybedX = 0.06908748f;
-	
+
 	const float keyW = 0.027352f;
 	const float keyH = 0.07307f;
 
diff --git a/Source/ColourSelectionPanels.h b/Source/ColourSelectionPanels.h
index 98d51841..17b88eb6 100644
--- a/Source/ColourSelectionPanels.h
+++ b/Source/ColourSelectionPanels.h
@@ -438,8 +438,6 @@ class PaletteEditPanel : public Component,
         lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
         if (lookAndFeel)
         {
-            lookAndFeel->setupTextButton(*saveButton);
-            lookAndFeel->setupTextButton(*cancelButton);
         }
     }
 
diff --git a/Source/CurvesArea.cpp b/Source/CurvesArea.cpp
index 4dfa49c4..90a29859 100644
--- a/Source/CurvesArea.cpp
+++ b/Source/CurvesArea.cpp
@@ -175,15 +175,6 @@ void CurvesArea::loadFromMapping()
 	dynamic_cast<VelocityCurveDlgBase*>(curvesTab->getCurrentContentComponent())->loadFromMapping();
 }
 
-void CurvesArea::lookAndFeelChanged()
-{
-	auto newLookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-	if (newLookAndFeel)
-	{
-		newLookAndFeel->setupToggleButton(*btnDeveloperMode);
-	}
-}
-
 void CurvesArea::sendConfigToController()
 {
 	// Send all curves configurations to controller
diff --git a/Source/CurvesArea.h b/Source/CurvesArea.h
index c4dfaf84..4a5024d9 100644
--- a/Source/CurvesArea.h
+++ b/Source/CurvesArea.h
@@ -64,8 +64,6 @@ class CurvesArea  : public juce::Component,
 	// New mapping is loaded. Display data.
 	void loadFromMapping();
 
-	void lookAndFeelChanged() override;
-
 	// Send curves configs to controller
 	void sendConfigToController();
 
diff --git a/Source/DeviceActivityMonitor.cpp b/Source/DeviceActivityMonitor.cpp
index fb9c0f19..b0e66cd6 100644
--- a/Source/DeviceActivityMonitor.cpp
+++ b/Source/DeviceActivityMonitor.cpp
@@ -12,90 +12,158 @@
 #include "Main.h"
 
 
-DeviceActivityMonitor::DeviceActivityMonitor(TerpstraMidiDriver& midiDriverIn, int responseTimeoutMsIn)
-    : midiDriver(&midiDriverIn), responseTimeoutMs(responseTimeoutMsIn),
-      Thread("DeviceActivityMonitor")
+DeviceActivityMonitor::DeviceActivityMonitor(TerpstraMidiDriver& midiDriverIn)
+    : midiDriver(midiDriverIn)
 {
-    detectMessage = midiDriver->getSerialIdentityRequestMessage();
-    detectDevicesIfDisconnected = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("DetectDeviceIfDisconnected", true);
-    checkConnectionOnInactivity = TerpstraSysExApplication::getApp().getPropertiesFile()->getBoolValue("CheckConnectionIfInactive", true);
-    midiDriver->addListener(this);
+    midiDriver.addListener(this);
 }
 
 DeviceActivityMonitor::~DeviceActivityMonitor()
 {
-    closeInputDevices();
-    closeOutputDevices();
+
 }
 
 void DeviceActivityMonitor::setDetectDeviceIfDisconnected(bool doDetection)
 {
     detectDevicesIfDisconnected = doDetection;
     TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("DetectDeviceIfDisconnected", detectDevicesIfDisconnected);
+
+    if (!detectDevicesIfDisconnected)
+    {
+        deviceConnectionMode = DetectConnectionMode::noDeviceActivity;
+        midiDriver.closeTestingDevices();
+    }
+    else
+    {
+        startTimer(detectRoutineTimeoutMs);
+    }
 }
 
 void DeviceActivityMonitor::setCheckForInactivity(bool monitorActivity)
 {
     checkConnectionOnInactivity = monitorActivity;
     TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("CheckConnectionIfInactive", checkConnectionOnInactivity);
+    
+    if (checkConnectionOnInactivity && isConnectionEstablished())
+        startTimer(inactivityTimeoutMs);
 }
 
-void DeviceActivityMonitor::startDetectionRoutine()
+void DeviceActivityMonitor::pingAllDevices()
 {
-    jassert(!deviceDetectInProgress);
-    if (threadShouldExit())
-        return;
+    deviceDetectInProgress = true;
+
+    outputDevices = midiDriver.getMidiOutputList();
 
-    midiDriver->removeListener(this);
+    outputPingIds.clear();
 
-    pingOutputIndex = -1;
+    waitingForTestResponse = true;
 
-    closeInputDevices();
-    closeOutputDevices();
+    // Impossible...but why not limit anyway?
+    const unsigned int maxDevices = jmin(outputDevices.size(), (1 << 28) - 1);
+    for (unsigned int i = 0; i < maxDevices; i++)
+    {
+        const unsigned int id = i + 1;
+        midiDriver.ping(id, i);
+        outputPingIds.add(id);
+    }
 
-    openAvailableInputDevices();
-    openAvailableOutputDevices();
+    startTimer(responseTimeoutMs);
+}
 
-    if (outputsToPing.size() > 0 && inputsListening.size() > 0)
+bool DeviceActivityMonitor::testLastConnectedDevice()
+{
+    String inputId = TerpstraSysExApplication::getApp().getPropertiesFile()->getValue("LastInputDeviceId");
+    if (inputId.length() <= 0)
+        return false;
+
+    int inputIndex = midiDriver.getIndexOfInputDevice(inputId);
+    if (inputIndex >= 0)
+    {
+        String outputId = TerpstraSysExApplication::getApp().getPropertiesFile()->getValue("LastOutputDeviceId");
+        if (outputId.length() <= 0)
+            return false;
+        
+        int outputIndex = midiDriver.getIndexOfOutputDevice(outputId);
+        if (outputIndex >= 0)
+        {
+            deviceDetectInProgress = true;
+            waitingForTestResponse = true;
+
+            DBG("Testing last connected device");
+            midiDriver.setMidiInput(inputIndex);
+            midiDriver.setMidiOutput(outputIndex);
+            midiDriver.sendGetSerialIdentityRequest();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void DeviceActivityMonitor::startIndividualDetection()
+{
+    jassert(outputPingIds.size() == 0);
+    
+    testOutputIndex = -1;
+    outputDevices = midiDriver.getMidiOutputList();
+    inputDevices = midiDriver.getMidiInputList();
+
+    if (outputDevices.size() > 0 && inputDevices.size() > 0)
     {
-        expectedResponseReceived = false;
         deviceDetectInProgress = true;
-        pingNextOutput();
+        testNextOutput();
     }
     else
     {
         DBG("No input and output MIDI device combination could be made.");
         deviceDetectInProgress = false;
-        wait(pingRoutineTimeoutMs);
+        startTimer(detectRoutineTimeoutMs);
     }
 }
 
-void DeviceActivityMonitor::pingNextOutput()
+void DeviceActivityMonitor::testNextOutput()
 {
-    pingOutputIndex++;
+    testOutputIndex++;
 
-    if (pingOutputIndex >= 0 && pingOutputIndex < outputsToPing.size() && outputsToPing[pingOutputIndex])
+    if (testOutputIndex >= 0 && testOutputIndex < outputDevices.size()) 
     {
-        DBG("Pinging " + outputsToPing[pingOutputIndex]->getName());
-        outputsToPing[pingOutputIndex]->sendMessageNow(detectMessage);
-        wait(responseTimeoutMs);
+        DBG("Testing " + outputDevices[testOutputIndex].name);
+        midiDriver.sendGetSerialIdentityRequest(testOutputIndex);
+        waitingForTestResponse = true;
+        startTimer(responseTimeoutMs);
     }
-
-    // Tried all devices, set timeout for next attempt
+    // failed
     else
     {
-        DBG("Detect device timeout.");
-        deviceDetectInProgress = false;
-        wait(pingRoutineTimeoutMs);
+        startTimer(10);
     }
 }
 
 void DeviceActivityMonitor::initializeDeviceDetection()
 {
-    deviceConnectionMode = DetectConnectionMode::lookingForDevice;
-    expectedResponseReceived = false;
-    deviceDetectInProgress = false;
-    startThread();
+    // Belongs somewhere else?
+    if (!midiDriver.hasDevicesDefined())
+    {
+        confirmedInputIndex = -1;
+        confirmedOutputIndex = -1;
+    }
+
+    if (detectDevicesIfDisconnected)
+    {
+        deviceConnectionMode = DetectConnectionMode::lookingForDevice;
+        deviceDetectInProgress = false; // Don't start until first test response is sent
+        startTimer(10);
+    }
+}
+
+void DeviceActivityMonitor::intializeConnectionLossDetection()
+{
+    if (checkConnectionOnInactivity)
+    {
+        deviceConnectionMode = DetectConnectionMode::waitingForInactivity;
+        waitingForTestResponse = false;
+        startTimer(inactivityTimeoutMs);
+    }
 }
 
 void DeviceActivityMonitor::stopDeviceDetection()
@@ -104,323 +172,339 @@ void DeviceActivityMonitor::stopDeviceDetection()
     deviceDetectInProgress = false;
 }
 
-//void DeviceActivityMonitor::pingAvailableDevices()
-//{
-//    const MidiMessage pingMsg = midiDriver->getSerialIdentityRequestMessage();
-//
-//    for (auto output : outputsToPing)
-//    {
-//        output
-//    }
-//}
-
-void DeviceActivityMonitor::intializeConnectionLossDetection(bool inFirmwareMode)
+void DeviceActivityMonitor::stopMonitoringDevice()
 {
-    if (inFirmwareMode)
-        deviceConnectionMode = DetectConnectionMode::gettingFirmwareVersion;
-    else
-        deviceConnectionMode = DetectConnectionMode::waitingForInactivity;
-
+    stopTimer();
     waitingForTestResponse = false;
-    midiDriver->addListener(this);
+    deviceConnectionMode = DetectConnectionMode::noDeviceMonitoring;
 }
 
-void DeviceActivityMonitor::initializeFirmwareUpdateMode()
-{ 
-    deviceConnectionMode = DetectConnectionMode::waitingForFirmwareUpdate; 
-    midiDriver->closeMidiInput();
-    midiDriver->closeMidiOutput();
-    sendChangeMessage();
-    expectedResponseReceived = false;
-    waitingForTestResponse = false;
-    midiDriver->addListener(this);
+bool DeviceActivityMonitor::initializeConnectionTest()
+{    
+    TerpstraSysExApplication::getApp().getLumatoneController().testCurrentDeviceConnection();
+
+    waitingForTestResponse = true;
+
+    return true;
 }
 
-void DeviceActivityMonitor::cancelFirmwareUpdateMode()
+
+void DeviceActivityMonitor::onSerialIdentityResponse(const MidiMessage& msg, int deviceIndexResponded)
 {
-    deviceConnectionMode = DetectConnectionMode::lookingForDevice;
     waitingForTestResponse = false;
-    midiDriver->removeListener(this);
-}
 
-void DeviceActivityMonitor::openAvailableOutputDevices()
-{
-    for (auto outputDeviceInfo : midiDriver->getMidiOutputList())
+    if (deviceConnectionMode == DetectConnectionMode::lookingForDevice)
     {
-        outputsToPing.add(MidiOutput::openDevice(outputDeviceInfo.identifier));
-    }
-}
+        if (midiDriver.hasDevicesDefined())
+        {
+            confirmedOutputIndex = midiDriver.getMidiOutputIndex();
+            confirmedInputIndex = midiDriver.getMidiInputIndex();
+        }
+        else
+        {
+            confirmedOutputIndex = testOutputIndex;
+            confirmedInputIndex = deviceIndexResponded;
+        }
 
-void DeviceActivityMonitor::openAvailableInputDevices()
-{
-    for (auto inputDeviceInfo : midiDriver->getMidiInputList())
-    {
-        auto input = inputsListening.add(MidiInput::openDevice(inputDeviceInfo.identifier, this));
-        if (input) input->start();
+        startTimer(10);
     }
-}
-
-void DeviceActivityMonitor::closeInputDevices()
-{
-    for (auto input : inputsListening)
+    else if (deviceConnectionMode == DetectConnectionMode::waitingForInactivity)
     {
-        if (input) input->stop();
+        startTimer(inactivityTimeoutMs);
     }
-
-    inputsListening.clear();
 }
 
-void DeviceActivityMonitor::closeOutputDevices()
+void DeviceActivityMonitor::onFailedPing(const MidiMessage& msg)
 {
-    // juce::MidiOutput stops background threads in its destructor
-    outputsToPing.clear();
+    unsigned int pingId = -1;
+    midiDriver.unpackPingResponse(msg, pingId);
+    if (pingId >= 0 && pingId < outputDevices.size())
+        outputDevices.remove(outputPingIds.indexOf(pingId));
 }
 
-bool DeviceActivityMonitor::initializeConnectionTest(DeviceActivityMonitor::DetectConnectionMode modeToUse)
+void DeviceActivityMonitor::onPingResponse(const MidiMessage& msg, int deviceIndexResponded)
 {
-    if (isThreadRunning() && threadShouldExit())
-        return false;
+    waitingForTestResponse = false;
 
-    MidiDeviceInfo inputInfo = midiDriver->getMidiOutputInfo();
-    MidiDeviceInfo outputInfo = midiDriver->getMidiInputInfo();
-    
-    if (inputInfo.identifier != "" && outputInfo.identifier != "")
+    if (deviceConnectionMode == DetectConnectionMode::lookingForDevice && outputPingIds.size() > 0)
     {
-        //DBG("Testing connection of input " + inputInfo.name + " and output " + outputInfo.name);
-        midiDriver->addListener(this);
-        {
-            ScopedLock lock(criticalSection);
-            deviceConnectionMode = modeToUse;
+        unsigned int pingId = 0;
+        auto errorCode = midiDriver.unpackPingResponse(msg, pingId);
 
-            if (deviceConnectionMode == DetectConnectionMode::gettingFirmwareVersion)
-                midiDriver->sendGetFirmwareRevisionRequest(true);
-            else
-                midiDriver->sendGetSerialIdentityRequest(true);
+        if (errorCode != FirmwareSupport::Error::noError)
+        {
+            if (errorCode == FirmwareSupport::Error::messageIsAnEcho)
+                return;
             
-            waitingForTestResponse = true;
-            expectedResponseReceived = false;
+            DBG("WARNING: Ping response error in auto connection routine detected");
+            jassertfalse;
+            return;
+        }
+
+        if (pingId > 0)
+        {
+            confirmedOutputIndex = pingId - 1;
+            confirmedInputIndex = deviceIndexResponded;
+            startTimer(10);
         }
-        
-        return true;
     }
 
-    return false;
+    else if (deviceConnectionMode == DetectConnectionMode::waitingForInactivity)
+    {
+        onTestResponseReceived();
+    }
 }
 
-void DeviceActivityMonitor::handleIncomingMidiMessage(MidiInput* source, const MidiMessage& response)
+void DeviceActivityMonitor::onTestResponseReceived()
 {
-    if (midiDriver->messageIsResponseToMessage(response, detectMessage))
-    {
-        auto data = response.getSysExData();
+    stopTimer();
 
-        // Is an echo of the request
-        if (data[5] == TerpstraMidiDriver::TerpstraMIDIAnswerReturnCode::NACK)
-        {
-            return;
-        }
+    waitingForTestResponse = false;
 
-        // Is an acknowledged answer and successful connection
-        else
-        {
-            expectedResponseReceived = true;
-            confirmedInputIndex = inputsListening.indexOf(source);
-            confirmedOutputIndex = pingOutputIndex;
-        }
+    if (deviceConnectionMode == DetectConnectionMode::lookingForDevice)
+    {
+        onSuccessfulDetection();
+    }
+
+    else if (deviceConnectionMode == DetectConnectionMode::waitingForInactivity)
+    {
+        startTimer(inactivityTimeoutMs);
     }
 }
 
 void DeviceActivityMonitor::checkDetectionStatus()
 {
-    // If turned off, stop detection immediately
-    // For future use
-    if (!detectDevicesIfDisconnected && deviceConnectionMode == DetectConnectionMode::lookingForDevice)
+    // Successful
+    if (isConnectionEstablished())
     {
-        stopDeviceDetection();
+        onTestResponseReceived();
     }
     else
     {
-        // Successful
-        if (expectedResponseReceived)
+        if (deviceDetectInProgress)
         {
-            onSuccessfulDetection();
-        }
+            // Failed last-device test
+            if (midiDriver.hasDevicesDefined())
+            {
+                DBG("Unable to connect to last device.");
+                waitingForTestResponse = false;
+                midiDriver.closeMidiInput();
+                midiDriver.closeMidiOutput();
+                pingAllDevices();
+            }
 
-        // Continue trying
-        else if (deviceDetectInProgress)
-        {
-            pingNextOutput();
+            // Failed ping routine
+            else if (outputPingIds.size() > 0)
+            {
+                waitingForTestResponse = false;
+                outputPingIds.clear();
+                startIndividualDetection();
+            }
+
+            // Ongoing GetSerial routine
+            else if (testOutputIndex >= 0 && testOutputIndex < outputDevices.size())
+            {
+                testNextOutput();
+            }
+            
+            // Set timeout for next attempt
+            else
+            {
+                DBG("Detect device timeout.");
+                deviceDetectInProgress = false;
+                waitingForTestResponse = false;
+                startTimer(detectRoutineTimeoutMs);
+            }
         }
 
-        // Restart detection
+        // Start detection
         else
         {
-            startDetectionRoutine();
+            midiDriver.refreshDeviceLists();
+            midiDriver.openAvailableDevicesForTesting();
+            deviceConnectionMode = DetectConnectionMode::lookingForDevice;
+
+            // If there's no last-connected-device, skip to pinging
+            //if (!testLastConnectedDevice())
+            //{
+                pingAllDevices();
+            //}
         }
     }
 }
 
-void DeviceActivityMonitor::run()
+void DeviceActivityMonitor::timerCallback()
 {
-    while (!threadShouldExit() && (detectDevicesIfDisconnected || checkConnectionOnInactivity))
-    {
-        while (activityIsPaused) { if (threadShouldExit()) return; };
+    stopTimer();
 
-        if (deviceConnectionMode < DetectConnectionMode::testingConnection)
+    if (deviceConnectionMode < DetectConnectionMode::noDeviceMonitoring)
+    {
+        if (detectDevicesIfDisconnected)
         {
-            if (detectDevicesIfDisconnected)
-            {
-                if (deviceDetectInProgress)
-                    checkDetectionStatus();
-
-                else if (!isConnectionEstablished())
-                    startDetectionRoutine();
-
-                else
-                    intializeConnectionLossDetection(deviceConnectionMode == DetectConnectionMode::waitingForFirmwareUpdate);
-            }
+            checkDetectionStatus();
+        }
+        else
+        {
+            stopDeviceDetection();
         }
-        else if (deviceConnectionMode == DetectConnectionMode::waitingForInactivity)
+    }
+    else if (deviceConnectionMode >= DetectConnectionMode::noDeviceMonitoring)
+    {
+        jassert(isConnectionEstablished() && midiDriver.hasDevicesDefined());
+        if (checkConnectionOnInactivity)
         {
             if (!waitingForTestResponse)
             {
                 if (midiQueueSize == 0)
                 {
-                    activitySinceLastTimeout = false;
-                    wait(inactivityTimeoutMs);
-                    if (midiQueueSize == 0 && !activitySinceLastTimeout)
-                        initializeConnectionTest(deviceConnectionMode);
+                    if (deviceConnectionMode == DetectConnectionMode::noDeviceMonitoring)
+                        deviceConnectionMode = DetectConnectionMode::waitingForInactivity;
+
+                    initializeConnectionTest();
                 }
-            }
-            else if (!expectedResponseReceived)
-            {
-                wait(responseTimeoutMs);
-                // Disconnected!
-                if (!expectedResponseReceived)
+                else
                 {
-                    jassert(confirmedInputIndex >= 0 && confirmedOutputIndex >= 0);
-                    {
-                        ScopedLock lock(criticalSection);
-                        expectedResponseReceived = false;
-                        waitingForTestResponse = false;
-                    }
-                    onDisconnection();
+                    startTimer(inactivityTimeoutMs);
                 }
             }
         }
-        else if (deviceConnectionMode == DetectConnectionMode::testingConnection)
+        else
         {
-            // Connection to selected devices failed
-            if (waitingForTestResponse)
-            {
-                jassert(confirmedInputIndex < 0 && confirmedOutputIndex < 0);
-                {
-                    ScopedLock lock(criticalSection);
-                    expectedResponseReceived = false;
-                    waitingForTestResponse = false;
-                    deviceConnectionMode = DetectConnectionMode::noDeviceActivity;
-                }
-                DBG("No response from selected MIDI devices.");
-                sendChangeMessage();
-            }
-            else if (checkConnectionOnInactivity)
-                intializeConnectionLossDetection();
+            stopMonitoringDevice();
         }
     }
-
-    deviceDetectInProgress = false;
-    waitingForTestResponse = false;
+    else
+        jassertfalse;
 }
 
 //=========================================================================
 // TerpstraMidiDriver::Listener Implementation
 
-void DeviceActivityMonitor::midiMessageReceived(const MidiMessage& midiMessage)
+void DeviceActivityMonitor::midiMessageReceived(MidiInput* source, const MidiMessage& msg)
 {
-    ScopedLock lock(criticalSection);
-
-    activitySinceLastTimeout = true;
-
-    // Ignore any non-SysEx related messages
-    if (!midiMessage.isSysEx())
-        return;
- 
-    auto sysExData = midiMessage.getSysExData();
-
-    if (sysExData[5] > TerpstraMidiDriver::NACK)
+    stopTimer();
+    
+    if (msg.isSysEx())
     {
-        if (midiDriver->messageIsGetSerialIdentityResponse(midiMessage))
+        if (waitingForTestResponse)
         {
-            waitingForTestResponse = false;
-            expectedResponseReceived = true;
+            auto sysExData = msg.getSysExData();
+            auto cmd = sysExData[CMD_ID];
 
-            if (!isThreadRunning())
+            // Skip echos, or mark as a failed ping
+            if (sysExData[MSG_STATUS] == TEST_ECHO)
             {
-                int currentInput = midiDriver->getLastMidiInputIndex();
-                int currentOutput = midiDriver->getLastMidiOutputIndex();
-                if (confirmedInputIndex != currentInput || confirmedOutputIndex != currentOutput)
+                switch (cmd)
+                {
+                case LUMA_PING:
                 {
-                    confirmedInputIndex = currentInput;
-                    confirmedOutputIndex = currentOutput;
+                    onFailedPing(msg);
+                    break;
+                }
+                case GET_SERIAL_IDENTITY:
+                    break;
+
+                case GET_FIRMWARE_REVISION:
+                    onTestResponseReceived();
+                    break;
+                    
+                default:
+                    return;
                 }
+                
+                waitingForTestResponse = false;
+                startTimer(10);
+            }
+            else if (sysExData[MSG_STATUS] == TerpstraMIDIAnswerReturnCode::ACK)
+            {
+                int deviceIndex = midiDriver.getMidiInputList().indexOf(source->getDeviceInfo());
+
+                switch (cmd)
+                {
+                case GET_SERIAL_IDENTITY:
+                    onSerialIdentityResponse(msg, deviceIndex);
+                    break;
+
+                case GET_FIRMWARE_REVISION:
+                    // TODO
+                    break;
+
+                case LUMA_PING:
+                    onPingResponse(msg, deviceIndex);
+                    break;
 
-                sendChangeMessage();
+                default:
+                    break;
+                }
             }
         }
-        else if (deviceConnectionMode == DetectConnectionMode::waitingForFirmwareUpdate && midiDriver->messageIsGetFirmwareRevisionResponse(midiMessage))
+        
+        // Edge case if we're disconnected but get a response
+        else if (!isConnectionEstablished())
+        {
+            confirmedInputIndex = midiDriver.getMidiInputIndex();
+            confirmedOutputIndex = midiDriver.getMidiOutputIndex();
+            
+            // Maybe not best solution?
+            deviceConnectionMode = DetectConnectionMode::lookingForDevice;
+            startTimer(10);
+        }
+        else
         {
-            expectedResponseReceived = true;
-            deviceDetectInProgress = false;
+            startTimer(inactivityTimeoutMs);
         }
     }
 }
 
-void DeviceActivityMonitor::onSuccessfulDetection()
+void DeviceActivityMonitor::noAnswerToMessage(const MidiMessage& midiMessage)
 {
+    stopTimer();
+    
+    if (waitingForTestResponse && deviceConnectionMode < DetectConnectionMode::noDeviceMonitoring)
     {
-        ScopedLock lock(criticalSection);
-
-        deviceDetectInProgress = false;
+        waitingForTestResponse = false;
+        
+        auto sysExData = midiMessage.getSysExData();
+        if (sysExData[CMD_ID] == LUMA_PING && outputPingIds.size() > 0)
+        {
+            onFailedPing(midiMessage);
+        }
+        else
+        {
+            checkDetectionStatus();
+        }
+    }
+    
+    else if (isConnectionEstablished())
+    {
+        onDisconnection();
+    }
+}
 
-        closeOutputDevices();
-        closeInputDevices(); // Connection loss is handled in TerpstraMidiDriver::Listener callback
+void DeviceActivityMonitor::onSuccessfulDetection()
+{
+    jassert(isConnectionEstablished());
 
-        midiDriver->setMidiInput(confirmedInputIndex);
-        midiDriver->setMidiOutput(confirmedOutputIndex);
-    }
+    deviceDetectInProgress = false;
+    outputPingIds.clear();
 
+    // LumatoneController will start this back up
+    deviceConnectionMode = DetectConnectionMode::noDeviceMonitoring;
+    
     sendChangeMessage();
-
-    if (checkConnectionOnInactivity && deviceConnectionMode != DetectConnectionMode::waitingForFirmwareUpdate)
-    {
-        intializeConnectionLossDetection();
-    }
 }
 
 void DeviceActivityMonitor::onDisconnection()
 {
-    {
-        ScopedLock lock(criticalSection);
-        DBG("DISCONNECTION DETECTED");
-
-        midiDriver->closeMidiInput();
-        midiDriver->closeMidiOutput();
+    DBG("DISCONNECTION DETECTED");
 
-        confirmedInputIndex = -1;
-        confirmedOutputIndex = -1;
+    confirmedInputIndex = -1;
+    confirmedOutputIndex = -1;
 
-        waitingForTestResponse = false;
-        expectedResponseReceived = false;
-        deviceConnectionMode = DetectConnectionMode::noDeviceActivity;
-    }
+    waitingForTestResponse = false;
 
+    // LumatoneController will start this back up
+    deviceConnectionMode = DetectConnectionMode::noDeviceActivity;
+    
     sendChangeMessage();
-
-    if (detectDevicesIfDisconnected)
-    {
-        wait(pingRoutineTimeoutMs);
-        startDetectionRoutine();
-        // Nullptrs are checked before opening devices but this could maybe be designed better
-        // to prevent trying to open invalid (disconnected) devices altogether
-    }
 }
-
diff --git a/Source/DeviceActivityMonitor.h b/Source/DeviceActivityMonitor.h
index e73982f0..5fcd526b 100644
--- a/Source/DeviceActivityMonitor.h
+++ b/Source/DeviceActivityMonitor.h
@@ -6,9 +6,11 @@
     Author:  Vincenzo
 
     Finds a pair of devices connected to Lumatone, and monitors activity 
-    to detect if the connection to the device is lost.
-
-    Sends a change message when a change in the connection status is detected;
+    to detect if the connection to the device is lost. When a change is detected
+    a change signal will be broadcasted (for LumatoneController).
+ 
+    When looking for devices, a response timeout is required, but once a device
+    has been confirmed, the timing and callbacks are dependent on TerpstraMidiDriver.
 
   ==============================================================================
 */
@@ -17,31 +19,25 @@
 
 #include "TerpstraMidiDriver.h"
 
-class DeviceActivityMonitor : public juce::Thread,
-                              public juce::MidiInputCallback,
-                              public TerpstraMidiDriver::Listener, 
-                              public juce::ChangeBroadcaster
+class DeviceActivityMonitor : public juce::Timer, public juce::ChangeBroadcaster, protected TerpstraMidiDriver::Listener
 {
     
 public:
     enum class DetectConnectionMode
     {
         noDeviceActivity = -1,
-        noDeviceMonitoring,
         lookingForDevice,
-        waitingForFirmwareUpdate, // "silent" lookingForDevice
-        testingConnection,
-        gettingFirmwareVersion, // connection tests with GetFirmwareRevision
+        noDeviceMonitoring,
         waitingForInactivity
     };
     
 public:
 
-    DeviceActivityMonitor(TerpstraMidiDriver& midiDriverIn, int responseTimeoutMsIn=700);
+    DeviceActivityMonitor(TerpstraMidiDriver& midiDriverIn);
     ~DeviceActivityMonitor() override;
 
     DetectConnectionMode getMode() const { return deviceConnectionMode; }
-    bool isConnectionEstablished() const { return expectedResponseReceived && confirmedInputIndex >= 0 && confirmedOutputIndex >= 0; }
+    bool isConnectionEstablished() const { return confirmedInputIndex >= 0 && confirmedOutputIndex >= 0; }
     
     bool willDetectDeviceIfDisconnected() const { return detectDevicesIfDisconnected; }
     void setDetectDeviceIfDisconnected(bool doDetection);
@@ -49,104 +45,110 @@ class DeviceActivityMonitor : public juce::Thread,
     bool willCheckForInactivity() const { return checkConnectionOnInactivity; }
     void setCheckForInactivity(bool monitorActivity);
 
-    bool isPaused() const { return activityIsPaused; }
-    void setPaused(bool pauseActivity) { activityIsPaused = pauseActivity; }
-
     int getConfirmedOutputIndex() const { return confirmedOutputIndex; }
     int getConfirmedInputIndex() const { return confirmedInputIndex; }
 
-    void testCurrentDevices() { initializeConnectionTest(); }
-
+    // Start monitoring available MIDI devices and wait for an expected response
+    // First uses the "Ping" command to send to all available devices,
+    // then goes through a legacy-supported routine with individual output devices.
     void initializeDeviceDetection();
 
-    void initializeFirmwareUpdateMode();
-    void cancelFirmwareUpdateMode();
+    // Set the timeout for message responses
+    void setResponseTimeoutMs(int timeoutMs) { responseTimeoutMs = timeoutMs; }
 
-    // Begin monitoring for unresponsiveness from device
-    void intializeConnectionLossDetection(bool inFirmwareMode = false);
+    // Begin polling selected device until it stops responding. Other messages
+    // will reset the inactivity timer.
+    void intializeConnectionLossDetection();
 
-    //=========================================================================
-    // juce::Thread Implementation
-
-    void run() override;
+    // Turn off device monitoring and idle
+    void stopMonitoringDevice();
 
     //=========================================================================
-    // juce::MidiInputCallback Implementation
-  
-    void handleIncomingMidiMessage(MidiInput*, const MidiMessage&) override;
+    // juce::Timer Implementation
 
-protected:
+    void timerCallback() override;
 
-    //=========================================================================
-    // TerpstraMidiDriver::Listener Implementation, only for connection loss detection
+    
+private:
 
-    void midiMessageReceived(const MidiMessage& midiMessage) override;
-    void midiMessageSent(const MidiMessage& midiMessage) override {}
-    void midiSendQueueSize(int queueSize) override { midiQueueSize = queueSize; }
-    void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {};
+    /// <summary>
+    /// Sends a ping to all devices to see if we get a response
+    /// </summary>
+    void pingAllDevices();
 
-private:
+    /// <summary>
+    /// If a MIDI device identifier is defined in properties, send a GetSerialIdentity to it.
+    /// Returns whether or not a test response was sent
+    /// </summary>
+    bool testLastConnectedDevice();
 
     /// <summary>
     /// Prepares to ping devices by refreshing available devices, opening them, and starting pinging routine
     /// </summary>
-    void startDetectionRoutine();
+    void startIndividualDetection();
 
-    // Determines whether or not to try to continue device detection, tries next pair if so
+    /// <summary>
+    /// Checks detection routines, will move on from Ping routine if no answers, then will drive the legacy detection routine
+    /// </summary>
     void checkDetectionStatus();
 
     /// <summary>
     /// Increments the output index and sends a Get Serial Identity message to this next output to listen for a response 
     /// </summary>
-    void pingNextOutput();
-
-    // TODO WITH ECHO FIRMWARE COMMAND
-    ///// <summary>
-    ///// Send a ping to all available outputs and prepare to listen to responses
-    ///// </summary>
-    //void pingAvailableDevices();
+    void testNextOutput();
 
     // Turn off device detection and idle
     void stopDeviceDetection();
 
-    void onSuccessfulDetection();
-
-    void openAvailableOutputDevices();
-    void openAvailableInputDevices();
-
-    void closeInputDevices();
-    void closeOutputDevices();
-
-
     /// <summary>
     /// Test device connectivity after a connection has previously been made.
     /// </summary>
     /// <returns>Returns false if devices are not valid, and true if it an attempt to connect was made</returns>
-    bool initializeConnectionTest(DetectConnectionMode modeToUse = DetectConnectionMode::testingConnection);
+    bool initializeConnectionTest();
+
+
+private:
+    //=========================================================================
+    // Callback functions
+
+    void onSerialIdentityResponse(const MidiMessage& msg, int deviceIndexResponded);
+
+    void onFailedPing(const MidiMessage& msg);
+    void onPingResponse(const MidiMessage& msg, int deviceIndexResponded);
+
+    void onTestResponseReceived();
+
+    void onSuccessfulDetection();
 
     void onDisconnection();
 
+protected:
+
+    //=========================================================================
+    // TerpstraMidiDriver::Listener Implementation
+
+    void midiMessageReceived(MidiInput* source, const MidiMessage& midiMessage) override;
+    void midiMessageSent(const MidiMessage& midiMessage) override {};
+    void midiSendQueueSize(int queueSizeIn) override { midiQueueSize = queueSizeIn; };
+    void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {};
+    void noAnswerToMessage(const MidiMessage& midiMessage) override;
+
 private:
-    
-    CriticalSection         criticalSection;
 
-    TerpstraMidiDriver*     midiDriver;
-    
-    MidiMessage             detectMessage;
+    TerpstraMidiDriver&     midiDriver;
 
-    DetectConnectionMode    deviceConnectionMode   = DetectConnectionMode::noDeviceMonitoring;
+    DetectConnectionMode    deviceConnectionMode   = DetectConnectionMode::noDeviceActivity;
     bool                    deviceDetectInProgress = false;
     bool                    waitingForTestResponse = false;
-    bool                    activityIsPaused       = false;
 
-    const int               responseTimeoutMs; // Pull from properties, currently 1000 by default
-    const int               pingRoutineTimeoutMs = 1000;
-    const int               inactivityTimeoutMs  = 5000;
+    int                     responseTimeoutMs = 500;
+    int                     detectRoutineTimeoutMs = 500;
+    int                     inactivityTimeoutMs  = 1500;
     
-    int                     pingOutputIndex = -1;
-
-    OwnedArray<MidiOutput>  outputsToPing;
-    OwnedArray<MidiInput>   inputsListening;
+    int                     testOutputIndex = -1;
+    Array<MidiDeviceInfo>   outputDevices;
+    Array<MidiDeviceInfo>   inputDevices;
+    Array<unsigned int>     outputPingIds;
 
     int                     confirmedInputIndex = -1;
     int                     confirmedOutputIndex = -1;
@@ -155,9 +157,6 @@ class DeviceActivityMonitor : public juce::Thread,
     
     bool                    detectDevicesIfDisconnected = true;
     bool                    checkConnectionOnInactivity = true;
-
-    bool                    expectedResponseReceived = false;
-    bool                    activitySinceLastTimeout = false;
     
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DeviceActivityMonitor)
 };
diff --git a/Source/EditActions.cpp b/Source/EditActions.cpp
new file mode 100644
index 00000000..c58e781a
--- /dev/null
+++ b/Source/EditActions.cpp
@@ -0,0 +1,147 @@
+/*
+  ==============================================================================
+
+    EditActions.cpp
+    Created: 9 May 2021 9:49:31pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "EditActions.h"
+#include "Main.h"
+
+namespace Lumatone {
+
+	SingleNoteAssignAction::SingleNoteAssignAction(
+		int setSelection,
+		int keySelection,
+		bool setKeyType,
+		bool setChannel, 
+		bool setNote,
+		bool setColour,
+		LumatoneKeyType newKeyType,
+		int newChannelNumber,
+		int newNoteNumber, 
+		TerpstraKey::COLOURTYPE newColour)
+		: setSelection(setSelection), keySelection(keySelection)
+		, setKeyType(setKeyType), setChannel(setChannel), setNote(setNote), setColour(setColour)
+		, newData(newKeyType, newChannelNumber, newNoteNumber, newColour)
+	{
+		auto mainComponent = TerpstraSysExApplication::getApp().getMainContentComponent();
+		jassert(mainComponent != nullptr);
+
+		previousData = mainComponent->getMappingInEdit().sets[setSelection].theKeys[keySelection];
+	}
+
+	bool SingleNoteAssignAction::isValid() const
+	{
+		return setSelection >= 0 && setSelection < NUMBEROFBOARDS && keySelection >= 0 && keySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize();
+	}
+
+	bool SingleNoteAssignAction::perform()
+	{
+		if (setSelection >= 0 && setSelection < NUMBEROFBOARDS && keySelection >= 0 && keySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize())
+		{
+			if (setKeyType || setChannel || setNote || setColour)
+			{
+				auto mainComponent = TerpstraSysExApplication::getApp().getMainContentComponent();
+				jassert(mainComponent != nullptr);
+				TerpstraKeyMapping& mappingInEdit = mainComponent->getMappingInEdit();
+
+				if (setKeyType)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].keyType = newData.keyType;
+				}
+				if (setChannel)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].channelNumber = newData.channelNumber;
+				}
+				if (setNote)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].noteNumber = newData.noteNumber;
+				}
+				if (setColour)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].colour = newData.colour;
+				}
+
+				// Send to device
+				TerpstraSysExApplication::getApp().getLumatoneController().sendKeyParam(
+					setSelection + 1, 
+					keySelection, 
+					mappingInEdit.sets[setSelection].theKeys[keySelection]);
+				
+				// Notfy that there are changes: in calling function
+			}
+			else
+			{
+				// Nothing to do
+				jassertfalse;
+			}
+
+			return true;
+		}
+		else
+		{
+			jassertfalse;
+			return false;
+		}
+	}
+
+	bool SingleNoteAssignAction::undo()
+	{
+		if (setSelection >= 0 && setSelection < NUMBEROFBOARDS && keySelection >= 0 && keySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize())
+		{
+			if (setKeyType || setChannel || setNote || setColour)
+			{
+				auto mainComponent = TerpstraSysExApplication::getApp().getMainContentComponent();
+				jassert(mainComponent != nullptr);
+				TerpstraKeyMapping& mappingInEdit = mainComponent->getMappingInEdit();
+
+				if (setKeyType)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].keyType = previousData.keyType;
+				}
+				if (setChannel)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].channelNumber = previousData.channelNumber;
+				}
+				if (setNote)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].noteNumber = previousData.noteNumber;
+				}
+				if (setColour)
+				{
+					mappingInEdit.sets[setSelection].theKeys[keySelection].colour = previousData.colour;
+				}
+
+				// Send to device
+				TerpstraSysExApplication::getApp().getLumatoneController().sendKeyParam(
+					setSelection + 1,
+					keySelection,
+					mappingInEdit.sets[setSelection].theKeys[keySelection]);
+
+				// Notfy that there are changes: in calling function
+			}
+			else
+			{
+				// Nothing to do
+				jassertfalse;
+			}
+
+			return true;
+		}
+		else
+		{
+			jassertfalse;
+			return false;
+		}
+	}
+
+	int SingleNoteAssignAction::getSizeInUnits()
+	{
+		return 2 * sizeof(int) + 6 * sizeof(bool) + 2 * sizeof(TerpstraKey);
+	}
+
+}
\ No newline at end of file
diff --git a/Source/EditActions.h b/Source/EditActions.h
new file mode 100644
index 00000000..aea31e55
--- /dev/null
+++ b/Source/EditActions.h
@@ -0,0 +1,63 @@
+/*
+  ==============================================================================
+
+    EditActions.h
+    Created: 9 May 2021 9:49:13pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include "../JuceLibraryCode/JuceHeader.h"
+#include "KeyboardDataStructure.h"
+
+namespace Lumatone {
+
+	class SingleNoteAssignAction : public UndoableAction
+	{
+	public:
+		SingleNoteAssignAction(
+			int setSelection,
+			int keySelection,
+			bool setKeyType,
+			bool setChannel, 
+			bool setNote,
+			bool setColour,
+			LumatoneKeyType newKeyType = LumatoneKeyType::noteOnNoteOff,
+			int newChannelNumber = 0, 
+			int newNoteNumber = 0,
+			TerpstraKey::COLOURTYPE newColour = juce::Colour());
+
+		SingleNoteAssignAction(SingleNoteAssignAction& second)
+			: setSelection(second.setSelection)
+			, keySelection(second.keySelection)
+			, setKeyType(second.setKeyType)
+			, setChannel(second.setChannel)
+			, setNote(second.setNote)
+			, setColour(second.setColour)
+			, previousData(second.previousData)
+			, newData(second.newData)
+		{}
+
+		bool isValid() const;
+
+		virtual bool perform() override;
+		virtual bool undo() override;
+		int getSizeInUnits() override;
+
+	private:
+		int setSelection = - 1;
+		int keySelection = -1;
+
+		bool setKeyType = false;
+		bool setChannel = false;
+		bool setNote = false;
+		bool setColour = false;
+
+		TerpstraKey previousData;
+		TerpstraKey newData;
+	};
+
+}
\ No newline at end of file
diff --git a/Source/FileBrowserComponent.h b/Source/FileBrowserComponent.h
index f68ac37e..798d1979 100644
--- a/Source/FileBrowserComponent.h
+++ b/Source/FileBrowserComponent.h
@@ -18,8 +18,8 @@ class PathBrowserComponent : public Component, public Button::Listener
 {
 public:
 
-    PathBrowserComponent(const String dialogBoxTitle, const File& fileIn = File::getSpecialLocation(File::SpecialLocationType::userDocumentsDirectory))
-        : chooser(dialogBoxTitle, File(), "*.tgz")
+    PathBrowserComponent(const String dialogBoxTitle, const File& fileIn = File::getSpecialLocation(File::SpecialLocationType::userDocumentsDirectory), String fileTypeFilter = "")
+        : chooser(dialogBoxTitle, File(), fileTypeFilter)
     {
         setName(dialogBoxTitle);
 
diff --git a/Source/FirmwareDlg.cpp b/Source/FirmwareDlg.cpp
deleted file mode 100644
index 29b43d1d..00000000
--- a/Source/FirmwareDlg.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-  ==============================================================================
-
-    FirmwareDlg.cpp
-    Created: 5 Feb 2021 7:33:07pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#include "FirmwareDlg.h"
-#include "Main.h"
-
-FirmwareDlg::FirmwareDlg()
-{
-    //checkUpdateBtn.reset(new TextButton("checkUpdateBtn"));
-    //checkUpdateBtn->setButtonText("Check For Updates");
-    //checkUpdateBtn->addListener(this);
-    //addAndMakeVisible(checkUpdateBtn.get());
-
-    auto properties = TerpstraSysExApplication::getApp().getPropertiesFile();
-    File lastFirmwareLocation = properties->getValue("LastFirmwareBinPath", properties->getValue("UserDocumentsLocation", File::getSpecialLocation(File::SpecialLocationType::userDocumentsDirectory).getFullPathName()));
-
-    fileBrowser.reset(new PathBrowserComponent("Lumatone Firmware Update", lastFirmwareLocation));
-    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::backgroundColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
-    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::textColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
-    fileBrowser->getEditor()->getProperties().set(LumatoneEditorStyleIDs::connectedEdgeFlags, Button::ConnectedEdgeFlags::ConnectedOnRight);
-    fileBrowser->addListener(this);
-    addAndMakeVisible(fileBrowser.get());
-
-    doUpdateBtn.reset(new TextButton("checkUpdateBtn"));
-    doUpdateBtn->setButtonText(translate("Begin Update"));
-    doUpdateBtn->addListener(this);
-    addAndMakeVisible(doUpdateBtn.get());
-
-    infoBox.reset(new TextEditor("FirmwareUpdateInfoBox"));
-    infoBox->setMouseClickGrabsKeyboardFocus(false);
-    infoBox->setReadOnly(true);
-    infoBox->setMultiLine(true);
-    infoBox->insertTextAtCaret(translate("Select a firmware file and then click \"Begin Update\""));
-    infoBox->setColour(TextEditor::ColourIds::backgroundColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
-    infoBox->setColour(TextEditor::ColourIds::textColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
-    infoBox->setColour(ScrollBar::ColourIds::thumbColourId, Colour(0xff2d3135));
-    infoBox->getProperties().set(LumatoneEditorStyleIDs::connectedEdgeFlags, 15);
-    addAndMakeVisible(infoBox.get());
-
-    firmwareStatusLabel.reset(new Label("FirmwareVersionStatusLabel"));
-    addAndMakeVisible(firmwareStatusLabel.get());
-    updateFirmwareVersionLabel();
-
-    //updateIsAvailable = TerpstraSysExApplication::getApp().isFirmwareUpdateAvailable();
-
-    if (!updateIsAvailable)
-    {
-        //doUpdateBtn->setEnabled(false);
-    }
-}
-
-FirmwareDlg::~FirmwareDlg()
-{
-    // Should check "who" paused it in the future
-    TerpstraSysExApplication::getApp().getDeviceMonitor().setPaused(false);
-    TerpstraSysExApplication::getApp().getMidiDriver().removeListener(this);
-}
-
-void FirmwareDlg::paint(Graphics& g)
-{
-
-}
-
-void FirmwareDlg::resized()
-{
-    int margin = 12;
-    int doubleMargin = margin * 2;
-    int buttonWidth = proportionOfWidth(0.3f);
-    int buttonHeight = 30;
-
-    //checkUpdateBtn->setBounds(margin, margin, buttonWidth, buttonHeight);
-
-    doUpdateBtn->setBounds(getWidth() - margin - buttonWidth, margin, buttonWidth, buttonHeight);
-    fileBrowser->setBounds(margin, margin, doUpdateBtn->getX() - doubleMargin, buttonHeight);
-
-    firmwareStatusLabel->setBounds(margin, fileBrowser->getBottom() + margin, getWidth() - doubleMargin, buttonHeight / 2);
-
-    infoBox->setBounds(getLocalBounds().withTop(firmwareStatusLabel->getBottom()).reduced(margin));
-    infoBox->applyFontToAllText(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic));
-}
-
-void FirmwareDlg::lookAndFeelChanged()
-{
-    auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-    if (lookAndFeel)
-    {
-        lookAndFeel->setupTextButton(*doUpdateBtn);
-        lookAndFeel->setupTextButton(*fileBrowser->getButton());
-    }
-}
-
-void FirmwareDlg::buttonClicked(Button* btn)
-{
-    //if (btn == checkUpdateBtn.get())
-    //{
-    //    DBG("Version check requested");
-    //}
-    if (btn == doUpdateBtn.get())
-    {
-        if (TerpstraSysExApplication::getApp().getMidiDriver().getLastMidiInputIndex() < 0 || TerpstraSysExApplication::getApp().getMidiDriver().getLastMidiOutputIndex() < 0)
-        {
-            AlertWindow::showMessageBox(AlertWindow::AlertIconType::NoIcon, "Not connected", "Please connect the Lumatone via USB before performing a firmware update.", "Ok", this);
-            return;
-        }
-
-        DBG("Update requested");
-
-        if (firmwareFileSelected.existsAsFile())
-        {
-            TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastFirmwareBinPath", firmwareFileSelected.getParentDirectory().getFullPathName());
-            initializeFirmwareUpdate();
-        }
-        else
-        {
-            infoBox->setText(infoBox->getText() + "Error: Not a valid firmware file...");
-        }
-    }
-}
-
-void FirmwareDlg::updateFirmwareVersionLabel()
-{
-    String firmwareVersion = TerpstraSysExApplication::getApp().getFirmwareVersionStr();
-    if (firmwareVersion != "0.0.0")
-    {
-        firmwareStatusLabel->setText("Current firmware version is: " + firmwareVersion, dontSendNotification);
-    }
-    else
-    {
-        firmwareStatusLabel->setText("Unable to determine firmware version.", dontSendNotification);
-    }
-}
-
-void FirmwareDlg::initializeFirmwareUpdate()
-{
-    firmwareTransfer.reset(new FirmwareTransfer(TerpstraSysExApplication::getApp().getMidiDriver()));
-    firmwareUpdateInProgress = true;
-    numberOfWaitIncrements = 0;
-    firmwareTransfer->addListener(this);
-    firmwareTransfer->requestFirmwareUpdate(firmwareFileSelected.getFullPathName());
-    //startTimer(infoUpdateTimeoutMs);
-}
-
-void FirmwareDlg::initializeWaitForUpdate()
-{
-    waitingForUpdateConfirmation = true;
-    TerpstraSysExApplication::getApp().getDeviceMonitor().initializeFirmwareUpdateMode();
-    TerpstraSysExApplication::getApp().getDeviceMonitor().setPaused(false);
-    TerpstraSysExApplication::getApp().getMidiDriver().addListener(this);
-    startTimer(updateIncrementTimeoutMs);
-}
-
-double FirmwareDlg::numIncrementsToProgress(int numberOfIncrements)
-{
-    return numberOfWaitIncrements / (double)maxUpdateIncrements;
-}
-
-void FirmwareDlg::fileChanged(PathBrowserComponent* source, File newFile)
-{
-    firmwareFileSelected = newFile;
-}
-
-void FirmwareDlg::firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode)
-{
-    String postMsg;
-
-    // TODO: Revise with progress bar
-    // Probably should all be handled by FirmwareTransfer
-    switch (statusCode)
-    {
-    case FirmwareTransfer::StatusCode::Initialize:
-        //postMsg = translate("Firmware update process initiated!");
-        break;
-    
-    case FirmwareTransfer::StatusCode::FileIntegrityCheck:
-        postMsg = translate("Checking integrity of firmware file...");
-        break;
-
-    case FirmwareTransfer::StatusCode::SessionBegin:
-        postMsg = translate("Establishing connection to Lumatone...");
-        break;
-
-    case FirmwareTransfer::StatusCode::AuthBegin:
-        postMsg = translate("Providing credentials...");
-        break;
-
-    case FirmwareTransfer::StatusCode::TransferBegin:
-        postMsg = translate("Transferring firmware file...");
-        break;
-
-    case FirmwareTransfer::StatusCode::InstallBegin:
-        postMsg = translate("Rebooting device for installation");
-        break;
-
-    case FirmwareTransfer::StatusCode::VerificationBegin:
-        postMsg = translate("Installing update...");
-        break;
-    case FirmwareTransfer::StatusCode::IntegrityErr:
-        postMsg = translate("Error: Not a valid Lumatone firmware file");
-        break;
-
-    case FirmwareTransfer::StatusCode::StartupErr:
-        postMsg = translate("Error: Could not prepare device communication protool");
-        break;
-
-    case FirmwareTransfer::StatusCode::HostConnectErr:
-        postMsg = translate("Error: Could not communicate with Lumatone");
-        break;
-
-    case FirmwareTransfer::StatusCode::SessionEstErr:
-        postMsg = translate("Error: Could not verify connection with Lumatone");
-        break;
-
-    case FirmwareTransfer::StatusCode::AuthErr:
-        postMsg = translate("Error: Authentication for Lumatone failed");
-        break;
-
-    case FirmwareTransfer::StatusCode::ChannelErr:
-        postMsg = translate("Error: Communication channel failure");
-        break;
-
-    case FirmwareTransfer::StatusCode::ExecChnlErr:
-        postMsg = translate("Error: Could not request device reboot. Try rebooting your Lumatone.");
-        break;
-
-    case FirmwareTransfer::StatusCode::NoErr:
-        postMsg = translate("Please wait for your Lumatone to install the firmware.");
-        break;
-    }
-
-    if (statusCode == FirmwareTransfer::StatusCode::InstallBegin)
-    {
-        TerpstraSysExApplication::getApp().getDeviceMonitor().setPaused(true);
-        TerpstraSysExApplication::getApp().getMidiDriver().closeMidiInput();
-        TerpstraSysExApplication::getApp().getMidiDriver().closeMidiOutput();
-    }
-    if (statusCode == FirmwareTransfer::StatusCode::VerificationBegin)
-    {
-        initializeWaitForUpdate();
-    }
-
-    if ((int)statusCode <= 0)
-    {
-        firmwareUpdateInProgress = false;
-    }
-
-    numberOfWaitIncrements += (int)(maxUpdateIncrements * FirmwareTransfer::statusCodeToProgressPercent(1) * 0.4);
-
-    firmwareTransfer->setStatusMessage(postMsg);
-    firmwareTransfer->setProgress(numIncrementsToProgress(numberOfWaitIncrements));
-
-    if (postMsg != "")
-    {
-        msgLog += (postMsg + "\n");
-        infoNeedsUpdate = true;
-        startTimer(infoUpdateTimeoutMs);
-    }
-}
-
-void FirmwareDlg::timerCallback()
-{
-    if (infoNeedsUpdate)
-    {
-        infoBox->setText(msgLog);
-        infoNeedsUpdate = false;
-
-        if (!waitingForUpdateConfirmation)
-        {
-            stopTimer();
-            return;
-        }
-    }
-    if (waitingForUpdateConfirmation)
-    {
-        numberOfWaitIncrements++;
-        firmwareTransfer->setProgress(numIncrementsToProgress(numberOfWaitIncrements));
-
-        if (numberOfWaitIncrements >= maxUpdateIncrements)
-        {
-            DBG("TIMEOUT EXCEEDED BEFORE GETTING FIRMWARE CONFIRMATION");
-
-            stopTimer();
-            firmwareTransfer->signalThreadShouldExit();
-            TerpstraSysExApplication::getApp().getDeviceMonitor().cancelFirmwareUpdateMode();
-            TerpstraSysExApplication::getApp().getMidiDriver().removeListener(this);
-
-            AlertWindow::showMessageBox(
-                AlertWindow::AlertIconType::WarningIcon,
-                "Firmware update not confirmed",
-                "Your Lumatone appears to still be updating, or may have been disconnected. Make sure Lumatone is powered on and connected, and the when Lumatone is ready it will connect successfully.",
-                "Ok", this);
-        }
-
-        startTimer(updateIncrementTimeoutMs);
-    }
-}
-
-void FirmwareDlg::exitSignalSent()
-{
-    firmwareTransfer->waitForThreadToExit(20);
-    firmwareTransfer = nullptr;
-    stopTimer();
-}
-
-void FirmwareDlg::midiMessageReceived(const MidiMessage& midiMessage)
-{
-    auto& midiDriver = TerpstraSysExApplication::getApp().getMidiDriver();
-    if (midiDriver.messageIsGetFirmwareRevisionResponse(midiMessage))
-    {
-        auto version = TerpstraMidiDriver::FirmwareVersion::fromGetFirmwareRevisionMsg(midiMessage);
-        if (version.isValid())
-        {
-            DBG("Confirmed update to firmware version " + version.toString());
-            
-            midiDriver.removeListener(this);
-            stopTimer();
-            firmwareTransfer->setProgress(1.0);
-            firmwareTransfer->signalThreadShouldExit();
-            updateFirmwareVersionLabel();
-            TerpstraSysExApplication::getApp().getDeviceMonitor().intializeConnectionLossDetection();
-        }
-    }
-}
diff --git a/Source/FirmwareTransfer.cpp b/Source/FirmwareTransfer.cpp
index e6f5ef83..a64fb632 100644
--- a/Source/FirmwareTransfer.cpp
+++ b/Source/FirmwareTransfer.cpp
@@ -40,12 +40,22 @@
 #include <ctype.h>
 #include <time.h>
 
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
 #include "libssh2.h"
 
 
-#define STOPBEFOREINIT if (threadShouldExit()) { DBG("Stopping, thread shutdown requested."); return StatusCode::ThreadKillErr; }
-#define STOPDURINGEXEC if (threadShouldExit()) { DBG("Stopping, thread shutdown requested."); return shutdownSSHSession(session, sock, localFile, StatusCode::ThreadKillErr); }
+#define STOPBEFOREINIT if (threadShouldExit()) {DBG("Stopping, thread shutdown requested."); return StatusCode::ThreadKillErr;}
+#if WIN32
+    #define STOPDURINGSETUP if (threadShouldExit()) {DBG("Stopping, thread shutdown requested."); closesocket(sock); return StatusCode::ThreadKillErr;}
+#else
+    #define STOPDURINGSETUP if (threadShouldExit()) {DBG("Stopping, thread shutdown requested."); close(sock); return StatusCode::ThreadKillErr;}
+#endif
+#define STOPDURINGEXEC if (threadShouldExit()) {DBG("Stopping, thread shutdown requested."); return shutdownSSHSession(session, sock, localFile, StatusCode::ThreadKillErr);}
 
+#define SOCKTIMEOUTMS 1000
 
 FirmwareTransfer::FirmwareTransfer(TerpstraMidiDriver& driverIn)
 	: juce::ThreadWithProgressWindow("Lumatone Firmware Update", true, false), midiDriver(driverIn)
@@ -60,6 +70,7 @@ FirmwareTransfer::~FirmwareTransfer()
 
 bool FirmwareTransfer::checkFirmwareFileIntegrity(String filePathIn)
 {
+	return true;
 	bool isValid = false;
 
 	if (File::isAbsolutePath(filePathIn))
@@ -72,7 +83,6 @@ bool FirmwareTransfer::checkFirmwareFileIntegrity(String filePathIn)
 			isValid = true;
 		}
 	}
-
 	return isValid; 
 }
 
@@ -80,7 +90,7 @@ bool FirmwareTransfer::requestFirmwareUpdate(String firmwareFilePath)
 {
 	if (!File::isAbsolutePath(firmwareFilePath))
 	{
-		listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, StatusCode::IntegrityErr);
+		listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, StatusCode::IntegrityErr, statusCodeToMessage(StatusCode::IntegrityErr));
 		return false;
 	}
 
@@ -103,6 +113,17 @@ bool FirmwareTransfer::requestFirmwareDownloadAndUpdate()
 	return false;
 }
 
+void FirmwareTransfer::incrementProgress()
+{
+	setProgress(numIncrementsToProgress(++numberOfWaitIncrements));
+
+	if (numberOfWaitIncrements >= maxUpdateIncrements)
+	{
+		DBG("TIMEOUT EXCEEDED BEFORE GETTING FIRMWARE CONFIRMATION");
+		signalThreadShouldExit();
+	}
+}
+
 void FirmwareTransfer::run()
 {
 	DBG("Started firmware update thread");
@@ -163,7 +184,7 @@ static FirmwareTransfer::StatusCode shutdownSSHSession(LIBSSH2_SESSION* session,
 	while (libssh2_session_disconnect(session, "Normal Shutdown,") == LIBSSH2_ERROR_EAGAIN);
 	libssh2_session_free(session);
 
-#ifdef WIN32
+#ifdef WIN32 // we're not distributing 32-bit, but just in case we ever need it
 	closesocket(sock);
 #else
 	close(sock);
@@ -179,24 +200,28 @@ static FirmwareTransfer::StatusCode shutdownSSHSession(LIBSSH2_SESSION* session,
 
 bool FirmwareTransfer::prepareForUpdate()
 {
-	listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, StatusCode::Initialize);
+	StatusCode returnStatus = StatusCode::Initialize;
+	listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, returnStatus, statusCodeToMessage(returnStatus));
 	if (!checkFirmwareFileIntegrity(selectedFileToTransfer))
 	{
 		// TODO: TRY TO HANDLE ERRORS
-		listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, StatusCode::IntegrityErr);
+		returnStatus = StatusCode::IntegrityErr;
+		listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, returnStatus, statusCodeToMessage(returnStatus));
 	}
 	else
 	{
-		listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, StatusCode::FileIntegrityCheck);
+		returnStatus = StatusCode::FileIntegrityCheck;
+		listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, returnStatus, statusCodeToMessage(returnStatus));
 
-		StatusCode returnStatus = performFirmwareUpdate();
+		StatusCode startStatus = performFirmwareUpdate();
 
 		if (threadShouldExit())
 			return false;
 
-		if (returnStatus == StatusCode::NoErr)
+		if (startStatus == StatusCode::NoErr)
 		{
-			listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, StatusCode::VerificationBegin);
+			returnStatus = StatusCode::VerificationBegin;
+			listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, returnStatus, statusCodeToMessage(returnStatus));
 			//setProgress(statusCodeToProgressPercent(StatusCode::VerificationBegin));
 
 			// Wait until we can connect, get the new firmware version, and then this will be signalled to exit
@@ -206,16 +231,16 @@ bool FirmwareTransfer::prepareForUpdate()
 		}
 
 		// Failure with some error
-		else if ((int)returnStatus < 0)
+		else if ((int)startStatus < 0)
 		{
-			listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, returnStatus);
+			listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, startStatus, statusCodeToMessage(startStatus));
 			// TODO: need to do anything else before shutdown? Output a log file?
 		}
 
 		else
 		{
 			// This currently shouldn't happen
-			jassert((int)returnStatus <= 0);
+			jassert((int)startStatus <= 0);
 		}
 	}
 
@@ -224,25 +249,26 @@ bool FirmwareTransfer::prepareForUpdate()
 
 void FirmwareTransfer::postUpdate(StatusCode codeIn)
 {
-	DBG("Firmware Transfer update: " + String((int)codeIn));
-	listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, codeIn);
-	//setProgress(statusCodeToProgressPercent(codeIn));
+	String msg = statusCodeToMessage(codeIn);
+	DBG("Firmware Transfer update: " + msg);
+	listeners.call(&FirmwareTransfer::ProcessListener::firmwareTransferUpdate, codeIn, msg);
+	setStatusMessage(msg);
+	numberOfWaitIncrements += (int)(maxUpdateIncrements * statusCodeToProgressPercent(1) * 0.4);
+	setProgress(numIncrementsToProgress(numberOfWaitIncrements));
 	progressMadeSinceUpdate = false;
 }
 
 // adapted from:
 // https://www.libssh2.org/examples/scp_write_nonblock.html
 // https://www.libssh2.org/examples/ssh2_exec.html
+// https://stackoverflow.com/a/61960339
 FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 {
 	// Shared SSH session data
-	const char* deviceHostName = SERVERHOST;
-	unsigned long hostaddr = inet_addr(deviceHostName);
 	const char* username = SERVERKEY;
 	const char* password = SERVERPWD;
 
     int sock;
-	struct sockaddr_in sin;
 
 	LIBSSH2_SESSION* session = NULL;
 	LIBSSH2_CHANNEL* channel;
@@ -271,34 +297,26 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 	int err;
 
 	err = WSAStartup(MAKEWORD(2, 0), &wsadata);
-	if (err != 0) {
+	if (err != 0)
+    {
 		DBG("WSAStartup failed with error: " + String(err));
 		return StatusCode::StartupErr;
 	}
 #endif
 
-    // Do a stop-thread check before making libssh calls
+    // Occasionally check if for thread exit request before session is initiated
     STOPBEFOREINIT
     
-	int returnCode = libssh2_init(0);
+    int returnCode = libssh2_init(0);
+    if (returnCode != 0)
+    {
+        DBG("libssh2 initialization failed! error: " + String(returnCode));
+        return StatusCode::StartupErr;
+    }
 
-	if (returnCode != 0)
-	{
-		DBG("libssh2 initialization failed! error: " + String(returnCode));
-		return StatusCode::StartupErr;
-	}
 
-	// Prepare data for file transfer
-	localFile = fopen(filePath, "rb");
-	if (!localFile)
-	{
-		DBG("failed to open file!");
-		return StatusCode::StartupErr;
-	}
 
-    STOPBEFOREINIT
-    
-	stat(filePath, &fileinfo);
+#ifdef JUCE_WIN
 
 	// Create socket and connect to port 22
 	sock = socket(AF_INET, SOCK_STREAM, 0);
@@ -308,18 +326,193 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 		return StatusCode::StartupErr;
 	}
 
-    STOPBEFOREINIT
-    
+	STOPBEFOREINIT
+
+	String deviceHostName = SERVERHOST;
+	unsigned int hostaddr = inet_addr(deviceHostName.getCharPointer());
+	struct sockaddr_in sin;
 	sin.sin_family = AF_INET;
 	sin.sin_port = htons(22);
 	sin.sin_addr.s_addr = hostaddr;
+	
 	if (connect(sock, (struct sockaddr*)(&sin), sizeof(struct sockaddr_in)) != 0)
 	{
 		DBG("failed to connect!");
+
+#if WIN32
+		closesocket(sock);
+#else
+		close(sock);
+#endif
+
 		return StatusCode::HostConnectErr;
 	}
     
-    STOPBEFOREINIT
+    
+#else
+    
+    int sockFlagsBefore = 0;
+
+    // Find correct hostname for OS
+    int failedTries = 0;
+    while (failedTries < 2)
+    {
+        STOPBEFOREINIT
+        returnCode = 0;
+        
+        // Create socket and connect to port 22
+        sock = socket(AF_INET, SOCK_STREAM, 0);
+        if (sock < 0)
+        {
+            DBG("failed to create socket!");
+            return StatusCode::StartupErr;
+        }
+        
+        if ((sockFlagsBefore = fcntl(sock, F_GETFL, 0) < 0))
+        {
+            DBG("bad socket flags received");
+        }
+        // Set to non-blocking
+        else if (fcntl(sock, F_SETFL, sockFlagsBefore | O_NONBLOCK) >= 0)
+        {
+            String deviceHostName = (failedTries == 0) ? SERVERHOST1 : SERVERHOST2;
+            unsigned int hostaddr = inet_addr(deviceHostName.getCharPointer());
+            struct sockaddr_in sin;
+            sin.sin_family = AF_INET;
+            sin.sin_port = htons(22);
+            sin.sin_addr.s_addr = hostaddr;
+
+            DBG("attempting to connect to host " + deviceHostName);
+            
+            do {
+                STOPDURINGSETUP
+                
+                if (connect(sock, (struct sockaddr*)(&sin), sizeof(struct sockaddr_in)) < 0)
+                {
+                    returnCode = errno;
+
+                    // If error, failure
+                    if ((errno != EWOULDBLOCK) && (errno != EINPROGRESS))
+                    {
+                        DBG("connection failed with error code: " + String(errno));
+                        failedTries++;
+                    }
+                
+                    // Wait with specified timeout
+                    else
+                    {
+                        // Set reference time b/c poll can be interrupted
+                        struct timespec now;
+                        if (clock_gettime(CLOCK_MONOTONIC, &now) < 0)
+                        {
+                            returnCode = -1;
+                            DBG("could not get current time");
+                        }
+                        else
+                        {
+                            struct timespec deadline =
+                            {
+                                .tv_sec = now.tv_sec,
+                                .tv_nsec = now.tv_nsec + SOCKTIMEOUTMS * 1000000l
+                            };
+                            
+                            do {
+                                // Keep checking how much time left
+                                if (clock_gettime(CLOCK_MONOTONIC, &now) < 0)
+                                {
+                                    returnCode = -1;
+                                    DBG("could not get current time");
+                                    break;
+                                }
+
+                                int msUntilDeadline = (int)( (deadline.tv_sec - now.tv_sec) * 1000l
+                                                           + (deadline.tv_nsec - now.tv_nsec) / 1000000l);
+                                if (msUntilDeadline < 0)
+                                {
+                                    returnCode = 0;
+                                    break;
+                                }
+
+                                STOPDURINGSETUP
+                                
+                                // Check connection status
+                                struct pollfd pfds[] = { { .fd = sock, .events = POLLOUT } };
+                                returnCode = poll(pfds, 1, msUntilDeadline);
+                                
+                                // Double-check there aren't other errors
+                                if (returnCode > 0)
+                                {
+                                    int err = 0;
+                                    socklen_t len = sizeof(err);
+                                    if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
+                                        errno = err;
+                                    
+                                    if (err != 0)
+                                    {
+                                        returnCode = -1;
+                                        DBG("connection failed with errno " + String(err));
+                                    }
+                                }
+                                
+                            } while (returnCode == -1 && errno == EINTR); // If poll was interrupted, try again
+                                
+                            if (returnCode == 0)
+                            {
+                                // Fail if timed out
+                                errno = ETIMEDOUT;
+                                returnCode = -1;
+                            }
+                            
+                            // Success
+                            else if (returnCode > 0)
+                                returnCode = 0;
+                        }
+                    }
+                }
+            } while(0);
+            
+            if (returnCode == 0)
+            {
+                DBG("connected to " + deviceHostName);
+                break;
+            }
+        }
+        else
+        {
+            DBG("could not set to non-blocking for host connection");
+        }
+        
+        DBG("connection attempt failed");
+
+        close(sock);
+        failedTries++;
+    }
+    
+    if (failedTries == 2)
+    {
+        return StatusCode::HostConnectErr;
+    }
+    
+    if (fcntl(sock, F_SETFL, sockFlagsBefore) < 0)
+    {
+        DBG("could not reset sock flags");
+        return StatusCode::StartupErr;
+    }
+
+
+#endif
+
+    // Prepare data for file transfer
+    localFile = fopen(filePath, "rb");
+    if (!localFile)
+    {
+        DBG("failed to open file!");
+        return StatusCode::StartupErr;
+    }
+    
+    stat(filePath, &fileinfo);
+    
+    STOPDURINGSETUP
 
 	/* Create a session instance */
 	session = libssh2_session_init();
@@ -332,11 +525,11 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 	/* tell libssh2 we want it all done non-blocking */
 	libssh2_session_set_blocking(session, 0);
 
-
 	/* ... start it up. This will trade welcome banners, exchange keys,
 	 * and setup crypto, compression, and MAC layers
 	 */
 	postUpdate(StatusCode::SessionBegin);
+    wait(300);
     while ((returnCode = libssh2_session_handshake(session, sock)) == LIBSSH2_ERROR_EAGAIN && !threadShouldExit()) {};
     STOPDURINGEXEC
 	progressMadeSinceUpdate = true;
@@ -516,8 +709,3 @@ FirmwareTransfer::StatusCode FirmwareTransfer::performFirmwareUpdate()
 
 	return shutdownSSHSession(session, sock, nullptr, StatusCode::NoErr);
 }
-
-void FirmwareTransfer::midiMessageReceived(const MidiMessage& midiMessage)
-{
-	// TODO
-}
diff --git a/Source/FirmwareTransfer.h b/Source/FirmwareTransfer.h
index c7b41d04..f3017bcb 100644
--- a/Source/FirmwareTransfer.h
+++ b/Source/FirmwareTransfer.h
@@ -11,9 +11,9 @@
 #pragma once
 #include "TerpstraMidiDriver.h"
 
-#define SSHCONNECTIMEOUT 5000
+#define UPDATETIMEOUT 5000
 
-class FirmwareTransfer : public juce::ThreadWithProgressWindow, public TerpstraMidiDriver::Listener
+class FirmwareTransfer : public juce::ThreadWithProgressWindow
 {
 public:
 
@@ -46,8 +46,7 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow, public TerpstraM
     ~FirmwareTransfer();
 
     bool   requestFirmwareUpdate(String firmwareFilePath);
-    bool   requestFirmwareDownloadAndUpdate(); // TODO
-
+    bool   requestFirmwareDownloadAndUpdate(); // TODO - probably better moved elsewhere
 
     bool   isFirmwareUpdateAvailable() { return true; /*TODO*/ }
 
@@ -56,10 +55,11 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow, public TerpstraM
 
     static String getLatestFirmwareVersion() { return ""; /*TODO*/ }
 
-
     bool isDownloadInProgress() const { return downloadRequested; }
     bool isTransferInProgress() const { return transferRequested; }
 
+    void incrementProgress();
+
     //=========================================================================
     //juce::Thread implementation
 
@@ -74,26 +74,17 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow, public TerpstraM
     // TODO use error codes
     static bool checkFirmwareFileIntegrity(String filePathIn);
 
-
 public:
 
     class ProcessListener
     {
     public:
-        virtual void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode)=0;
+        virtual void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg)=0;
     };
 
-    void addListener(ProcessListener* listenerIn) { listeners.add(listenerIn); }
-
-    void removeListener(ProcessListener* listenerIn) { listeners.remove(listenerIn); }
+    void addTransferListener(ProcessListener* listenerIn) { listeners.add(listenerIn); }
 
-
-public:
-
-    static double statusCodeToProgressPercent(int codeIn)
-    {
-        return (double)codeIn / (int)StatusCode::VerificationBegin;
-    }
+    void removeTransferListener(ProcessListener* listenerIn) { listeners.remove(listenerIn); }
 
 protected:
 
@@ -110,16 +101,12 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow, public TerpstraM
     //static int shutdownSSHSession(LIBSSH2_SESSION*, int, FILE*, int returnCode = 0);
     //static int waitForSSHSocket(int, LIBSSH2_SESSION*); 
 
-    void midiMessageReceived(const MidiMessage& midiMessage) override; // TODO
-    void midiMessageSent(const MidiMessage& midiMessage) override {};
-    void midiSendQueueSize(int queueSize) override {};
-    void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {};
-
-
 private:
 
     void postUpdate(StatusCode codeIn);
 
+    double numIncrementsToProgress(int numberOfIncrements) { return numberOfIncrements / (double)maxUpdateIncrements; }
+
 private:
 
     TerpstraMidiDriver& midiDriver;
@@ -132,4 +119,69 @@ class FirmwareTransfer : public juce::ThreadWithProgressWindow, public TerpstraM
 
     // For shortening the built-in libssh2 timeout period
     bool progressMadeSinceUpdate = false;
+
+    int numberOfWaitIncrements = 0;
+    // Estimation based on boot time of ~85 seconds, plus transfer time, and overhead
+    const int maxUpdateIncrements = 300000 / UPDATETIMEOUT;
+
+public:
+
+    static String statusCodeToMessage(FirmwareTransfer::StatusCode statusCode)
+    {
+        switch (statusCode)
+        {
+        case FirmwareTransfer::StatusCode::Initialize:
+            return translate("Firmware update process initiated!");
+
+        case FirmwareTransfer::StatusCode::FileIntegrityCheck:
+            return translate("Checking integrity of firmware file...");
+
+        case FirmwareTransfer::StatusCode::SessionBegin:
+            return translate("Establishing connection to Lumatone...");
+
+        case FirmwareTransfer::StatusCode::AuthBegin:
+            return translate("Providing credentials...");
+
+        case FirmwareTransfer::StatusCode::TransferBegin:
+            return translate("Transferring firmware file...");
+
+        case FirmwareTransfer::StatusCode::InstallBegin:
+            return translate("Rebooting device for installation");
+
+        case FirmwareTransfer::StatusCode::VerificationBegin:
+            return translate("Installing update...");
+
+        case FirmwareTransfer::StatusCode::IntegrityErr:
+            return translate("Error: Not a valid Lumatone firmware file");
+
+        case FirmwareTransfer::StatusCode::StartupErr:
+            return translate("Error: Could not prepare device communication protool");
+
+        case FirmwareTransfer::StatusCode::HostConnectErr:
+            return translate("Error: Could not communicate with Lumatone");
+
+        case FirmwareTransfer::StatusCode::SessionEstErr:
+            return translate("Error: Could not verify connection with Lumatone");
+
+        case FirmwareTransfer::StatusCode::AuthErr:
+            return translate("Error: Authentication for Lumatone failed");
+
+        case FirmwareTransfer::StatusCode::ChannelErr:
+            return translate("Error: Communication channel failure");
+
+        case FirmwareTransfer::StatusCode::ExecChnlErr:
+            return translate("Error: Could not request device reboot. Try rebooting your Lumatone.");
+
+        case FirmwareTransfer::StatusCode::NoErr:
+            return translate("Please wait for your Lumatone to install the firmware.");
+
+        default:
+            return translate("Unspecified error.");
+        }
+    }
+
+    static double statusCodeToProgressPercent(int codeIn)
+    {
+        return (double)codeIn / (int)FirmwareTransfer::StatusCode::VerificationBegin;
+    }
 };
diff --git a/Source/GeneralOptionsDlg.cpp b/Source/GeneralOptionsDlg.cpp
index 02d2d3ba..2e0ffe6c 100644
--- a/Source/GeneralOptionsDlg.cpp
+++ b/Source/GeneralOptionsDlg.cpp
@@ -119,7 +119,7 @@ void GeneralOptionsDlg::buttonClicked (juce::Button* buttonThatWasClicked)
         //[UserButtonCode_buttonAfterTouchActive] -- add your button handler code here..
 		((MainContentComponent*)getParentComponent())->getMappingInEdit().afterTouchActive = buttonAfterTouchActive->getToggleState();
 		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-		TerpstraSysExApplication::getApp().getMidiDriver().sendAfterTouchActivation(buttonAfterTouchActive->getToggleState());
+		TerpstraSysExApplication::getApp().getLumatoneController().setAftertouchEnabled(buttonAfterTouchActive->getToggleState());
         //[/UserButtonCode_buttonAfterTouchActive]
     }
     else if (buttonThatWasClicked == buttonLightOnKeyStrokes.get())
@@ -127,7 +127,7 @@ void GeneralOptionsDlg::buttonClicked (juce::Button* buttonThatWasClicked)
         //[UserButtonCode_buttonLightOnKeyStrokes] -- add your button handler code here..
 		((MainContentComponent*)getParentComponent())->getMappingInEdit().lightOnKeyStrokes = buttonLightOnKeyStrokes->getToggleState();
 		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-		TerpstraSysExApplication::getApp().getMidiDriver().sendLightOnKeyStrokes(buttonLightOnKeyStrokes->getToggleState());
+		TerpstraSysExApplication::getApp().getLumatoneController().sendLightOnKeyStrokes(buttonLightOnKeyStrokes->getToggleState());
         //[/UserButtonCode_buttonLightOnKeyStrokes]
     }
 
@@ -144,8 +144,6 @@ void GeneralOptionsDlg::lookAndFeelChanged()
     if (lookAndFeel)
     {
         labelGeneralSettingslTitle->setColour(Label::ColourIds::textColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
-        lookAndFeel->setupToggleButton(*buttonAfterTouchActive);
-        lookAndFeel->setupToggleButton(*buttonLightOnKeyStrokes);
     }
 }
 
diff --git a/Source/GlobalSettingsArea.cpp b/Source/GlobalSettingsArea.cpp
index 203b85e8..c1a38e80 100644
--- a/Source/GlobalSettingsArea.cpp
+++ b/Source/GlobalSettingsArea.cpp
@@ -19,7 +19,7 @@
 
 //[Headers] You can add your own extra header files here...
 #include "Main.h"
-#include "CalibrationDlg.h"
+#include "Settings/CalibrationDlg.h"
 //[/Headers]
 
 #include "GlobalSettingsArea.h"
@@ -198,12 +198,12 @@ void GlobalSettingsArea::changeListenerCallback(ChangeBroadcaster *source)
 	if (source == inactiveMacroButtonColourEdit.get())
 	{
 		String inactiveMacroButtonColour = inactiveMacroButtonColourEdit->getColourAsString();
-		TerpstraSysExApplication::getApp().getMidiDriver().sendMacroButtonInactiveColour(inactiveMacroButtonColour);
+		TerpstraSysExApplication::getApp().getLumatoneController().sendMacroButtonInactiveColour(inactiveMacroButtonColour);
 	}
 	else if (source == activeMacroButtonColourEdit.get())
 	{
 		String activeMacroButtonColour = activeMacroButtonColourEdit->getColourAsString();
-		TerpstraSysExApplication::getApp().getMidiDriver().sendMacroButtonActiveColour(activeMacroButtonColour);
+		TerpstraSysExApplication::getApp().getLumatoneController().sendMacroButtonActiveColour(activeMacroButtonColour);
 	}
 }
 
diff --git a/Source/GlobalSettingsArea.h b/Source/GlobalSettingsArea.h
index 0ed6f848..10e258c2 100644
--- a/Source/GlobalSettingsArea.h
+++ b/Source/GlobalSettingsArea.h
@@ -22,7 +22,7 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 #include "ColourEditComponent.h"
-#include "SettingsContainer.h"
+#include "Settings/SettingsContainer.h"
 //[/Headers]
 
 
diff --git a/Source/HajuLib/HajuErrorVisualizer.cpp b/Source/HajuLib/HajuErrorVisualizer.cpp
index 68b23bbb..9f38c4aa 100644
--- a/Source/HajuLib/HajuErrorVisualizer.cpp
+++ b/Source/HajuLib/HajuErrorVisualizer.cpp
@@ -15,6 +15,12 @@ HajuErrorVisualizer::HajuErrorVisualizer(LookAndFeel& lookAndFeelValue)
 {
 }
 
+void HajuErrorVisualizer::setErrorLevel(ErrorLevel errorLevel, String toolTipText)
+{
+    lastErrorLevel = errorLevel;
+    currentText = toolTipText;
+}
+
 void HajuErrorVisualizer::setErrorLevel(
     SettableTooltipClient& tooltipClient,
     Component& component,
@@ -22,21 +28,7 @@ void HajuErrorVisualizer::setErrorLevel(
     String toolTipText,
     int bgColourId)
 {
-    //Colour bgColour = lookAndFeel.findColour(bgColourId);
-
-
-    //switch(errorLevel)
-    //{
-    //case ErrorLevel::warning:
-    //    bgColour = bgColour.overlaidWith(Colours::yellow).withAlpha(0.5f);
-    //    break;
-    //case ErrorLevel::error:
-    //    bgColour = bgColour.overlaidWith(Colours::red).withAlpha(0.5f);
-    //    break;
-    //default:
-    //    break;
-    //}
-
+    setErrorLevel(errorLevel, toolTipText);
     tooltipClient.setTooltip(toolTipText);
     component.setColour(bgColourId, errorLevelColours[errorLevel]);
     component.repaint();
diff --git a/Source/HajuLib/HajuErrorVisualizer.h b/Source/HajuLib/HajuErrorVisualizer.h
index de725f99..7d33ea77 100644
--- a/Source/HajuLib/HajuErrorVisualizer.h
+++ b/Source/HajuLib/HajuErrorVisualizer.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "../../TerpstraSysEx.2014/JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
 
 class HajuErrorVisualizer
@@ -29,6 +29,8 @@ class HajuErrorVisualizer
 
     // Methods
 public:
+    void setErrorLevel(ErrorLevel errorLevel, String toolTipText);
+
     void setErrorLevel(
         SettableTooltipClient& tooltipClient,
         Component& component,
@@ -46,7 +48,8 @@ class HajuErrorVisualizer
 
     // Attributes
 private:
-    LookAndFeel& lookAndFeel;
-
+    LookAndFeel&  lookAndFeel;
+    ErrorLevel    lastErrorLevel;
+    String        currentText;
     Array<Colour> errorLevelColours = { Colour(0xff84aea3), Colour(0xffc9c238), Colour(0xffd7002a) };
 };
\ No newline at end of file
diff --git a/Source/HajuLib/HajuMidiDriver.cpp b/Source/HajuLib/HajuMidiDriver.cpp
index fcd16179..720c649e 100644
--- a/Source/HajuLib/HajuMidiDriver.cpp
+++ b/Source/HajuLib/HajuMidiDriver.cpp
@@ -15,99 +15,152 @@ HajuMidiDriver::HajuMidiDriver()
 {
 	midiInputs = MidiInput::getAvailableDevices();
 	midiOutputs = MidiOutput::getAvailableDevices();
+    midiInput = nullptr;
+    midiOutput = nullptr;
 }
 
 HajuMidiDriver::~HajuMidiDriver()
 {
-    if (midiInput.get() != nullptr)
+    if (midiInput != nullptr)
     {
         midiInput->stop();
+        midiInput = nullptr;
     }
 
-
 	midiOutput = nullptr;
 }
 
-Array<MidiDeviceInfo> HajuMidiDriver::getMidiInputList()
+const Array<MidiDeviceInfo>& HajuMidiDriver::getMidiInputList()
 {
 	return midiInputs;
 }
 
-Array<MidiDeviceInfo> HajuMidiDriver::getMidiOutputList()
+const Array<MidiDeviceInfo>& HajuMidiDriver::getMidiOutputList()
 { 
 	return midiOutputs;
 }
 
-MidiDeviceInfo HajuMidiDriver::getMidiInputInfo() const
+int HajuMidiDriver::getIndexOfInputDevice(String inputDeviceId) const
 {
-    return midiInputs[lastInputIndex];
+    for (int i = 0; i < midiInputs.size(); i++)
+        if (midiInputs[i].identifier == inputDeviceId)
+            return i;
+
+    return -1;
 }
 
-MidiDeviceInfo HajuMidiDriver::getMidiOutputInfo() const
+
+int HajuMidiDriver::getIndexOfOutputDevice(String outputDeviceId) const
 {
-    if (midiOutput.get())
-        return midiOutput->getDeviceInfo();
-    return MidiDeviceInfo();
+    for (int i = 0; i < midiOutputs.size(); i++)
+        if (midiOutputs[i].identifier == outputDeviceId)
+            return i;
+
+    return -1;
 }
 
-void HajuMidiDriver::refreshDeviceLists()
+bool HajuMidiDriver::refreshDeviceLists()
 {
+    bool inputsChanged = false;
+    auto newInputs = MidiInput::getAvailableDevices();
+    if (newInputs.size() == midiInputs.size())
+    {
+        for (int i = 0; i < newInputs.size(); i++)
+            if (newInputs[i] != midiInputs[i])
+                inputsChanged = true;
+    }
+    else
+        inputsChanged = true;
+
     // Reset last opened device to be the same index
     // so we close the correct one if that's requested
     // order change is probably rare but can't be guaranteed
-    
-    if (lastInputIndex >= 0)
+
+    if (inputsChanged)
     {
-        String lastInputId = midiInputs[lastInputIndex].identifier;
-        midiInputs = MidiInput::getAvailableDevices();
+        if (lastInputIndex >= 0)
+        {
+            String lastInputId = midiInputs[lastInputIndex].identifier;
 
-        for (int i = 0; i < midiInputs.size(); i++)
-            if (midiInputs[i].identifier == lastInputId)
-                lastInputIndex = i;
+            for (int i = 0; i < newInputs.size(); i++)
+                if (newInputs[i].identifier == lastInputId)
+                    lastInputIndex = i;
+        }
+        
+        midiInputs = newInputs;
+    }
+
+    bool outputsChanged = false;
+    auto newOutputs = MidiOutput::getAvailableDevices();
+    if (newOutputs.size() == midiOutputs.size())
+    {
+        for (int i = 0; i < newOutputs.size(); i++)
+            if (newOutputs[i] != midiOutputs[i])
+                outputsChanged = true;
     }
     else
-        midiInputs = MidiInput::getAvailableDevices();
-    
-    if (lastOutputIndex >= 0)
+        outputsChanged = true;
+
+    if (outputsChanged)
     {
-        String lastOutputId = midiOutputs[lastOutputIndex].identifier;
-        midiOutputs = MidiOutput::getAvailableDevices();
+        if (lastOutputIndex >= 0)
+        {
+            String lastOutputId = midiOutputs[lastOutputIndex].identifier;
+
+            for (int i = 0; i < newOutputs.size(); i++)
+                if (newOutputs[i].identifier == lastOutputId)
+                    lastOutputIndex = i;
+        }
         
-        for (int i = 0; i < midiOutputs.size(); i++)
-            if (midiOutputs[i].identifier == lastOutputId)
-                lastOutputIndex = i;
+        midiOutputs = newOutputs;
     }
-    else
-        midiOutputs = MidiOutput::getAvailableDevices();
+
+    return inputsChanged || outputsChanged;
 }
 
 void HajuMidiDriver::setMidiInput(int deviceIndex)
 {
-    if (midiInput.get())
-    {
-        midiInput->stop();
-    }
+    jassert(deviceIndex >= 0 && deviceIndex < midiInputs.size());
 
-    auto newInput = MidiInput::openDevice(midiInputs[deviceIndex].identifier, this);
-	midiInput.swap(newInput);
-    midiInput->start();
+    testInputs.clear();
+    closeMidiInput();
     
-    lastInputIndex = deviceIndex;
+    DBG("Trying to open input device: " + midiInputs[deviceIndex].name);
+    selectedInput = MidiInput::openDevice(midiInputs[deviceIndex].identifier, this);
+
+    if (selectedInput != nullptr)
+    {
+        midiInput = selectedInput.get();
+        midiInput->start();
+
+        lastInputIndex = deviceIndex;
+        lastInputDevice = midiInputs[deviceIndex];
+    }
+    else
+    {
+        DBG("WARNING: Could not open up input device " + String(deviceIndex));
+    }
 }
 
 void HajuMidiDriver::setMidiOutput(int deviceIndex)
 {
-	jassert(deviceIndex >= 0 && deviceIndex < midiOutputs.size());
-    
-    auto newOutput = MidiOutput::openDevice(midiOutputs[deviceIndex].identifier);
-    
-    if (newOutput == nullptr)
-        DBG("WARNING: Could not open up output device " + midiOutputs[deviceIndex].identifier);
-    
-    else if (newOutput != midiOutput)
+    jassert(deviceIndex >= 0 && deviceIndex < midiOutputs.size());
+
+    testOutputs.clear();
+    closeMidiOutput();
+
+    DBG("Trying to open output device: " + midiOutputs[deviceIndex].name);
+    selectedOutput = MidiOutput::openDevice(midiOutputs[deviceIndex].identifier);
+
+    if (selectedOutput != nullptr)
     {
-        midiOutput.swap(newOutput);
+        midiOutput = selectedOutput.get();
         lastOutputIndex = deviceIndex;
+        lastOutputDevice = midiOutputs[deviceIndex];
+    }
+    else
+    {
+        DBG("WARNING: Could not open up output device " + String(deviceIndex));
     }
 }
 
@@ -134,17 +187,82 @@ void HajuMidiDriver::sendNoteOffMessage(int noteNumber, int channelNumber, uint8
 
 void HajuMidiDriver::closeMidiInput()
 {
-    if (midiInput.get())
+    if (midiInput != nullptr)
     {
         midiInput->stop();
         midiInput = nullptr;
-
-        lastInputIndex = -1;
+       lastInputIndex = -1;
     }
+    
+    selectedInput = nullptr;
 }
 
 void HajuMidiDriver::closeMidiOutput()
 {
-    midiOutput = nullptr;
-    lastOutputIndex = -1;
-}
\ No newline at end of file
+    if (midiOutput != nullptr)
+    {
+        midiOutput = nullptr;
+        lastOutputIndex = -1;
+    }
+
+    if (selectedOutput != nullptr)
+    {
+        selectedOutput = nullptr;
+    }
+}
+
+//============================================================================
+// Device detection support
+
+void HajuMidiDriver::openAvailableDevicesForTesting()
+{
+    // May be preferable to only close and open input devices when necessary
+    closeTestingDevices();
+
+    for (auto device : midiOutputs)
+    {
+        auto newOutput = testOutputs.add(MidiOutput::openDevice(device.identifier));
+        if (newOutput == nullptr)
+            testOutputs.removeObject(newOutput);
+    }
+
+    for (auto device : midiInputs)
+    {
+        auto newInput = testInputs.add(MidiInput::openDevice(device.identifier, this));
+        if (newInput != nullptr)
+            newInput->start();
+        else
+            testInputs.removeObject(newInput);
+    }
+}
+
+void HajuMidiDriver::sendTestMessageNow(int outputDeviceIndex, const MidiMessage& message)
+{
+    // Return some error code?
+    if (outputDeviceIndex >= 0 && outputDeviceIndex < testOutputs.size())
+    {
+        //DBG("Sending this message to " + testOutputs[outputDeviceIndex]->getName() + ":");
+        //DBG("          " + message.getDescription());
+        testOutputs.getUnchecked(outputDeviceIndex)->sendMessageNow(message);
+    }
+}
+
+// Closes all open testing devices; either setMidiInput and setMidiOutput will call this if it's not empty
+void HajuMidiDriver::closeTestingDevices()
+{
+    if (testOutputs.size() > 0)
+        testOutputs.clear();
+
+    int errors = 0;
+    for (int i = 0; i < testInputs.size(); i++)
+    {
+        auto input = testInputs[i];
+        if (input != nullptr)
+        {
+            input->stop();
+            input = nullptr;
+        }
+    }
+
+    testInputs.clear();
+}
diff --git a/Source/HajuLib/HajuMidiDriver.h b/Source/HajuLib/HajuMidiDriver.h
index 39b60b7b..4a4e7ab6 100644
--- a/Source/HajuLib/HajuMidiDriver.h
+++ b/Source/HajuLib/HajuMidiDriver.h
@@ -29,19 +29,35 @@ class HajuMidiDriver : public MidiInputCallback
 
 	virtual void handleIncomingMidiMessage(MidiInput*, const MidiMessage&) = 0;
 
+	//============================================================================
+	// Primary functions with supported MIDI device
+
 	// List of MIDI input device names
-	Array<MidiDeviceInfo> getMidiInputList();
+	const Array<MidiDeviceInfo>& getMidiInputList();
 	// List of MIDI output device names
-	Array<MidiDeviceInfo> getMidiOutputList();
+	const Array<MidiDeviceInfo>& getMidiOutputList();
     
-    MidiDeviceInfo getMidiOutputInfo() const;
-    MidiDeviceInfo getMidiInputInfo() const;
+	MidiDeviceInfo getLastMidiOutputInfo() const { return lastOutputDevice; }
+	MidiDeviceInfo getLastMidiInputInfo() const { return lastInputDevice; }
     
-    int getLastMidiInputIndex() const { return lastInputIndex; }
-    int getLastMidiOutputIndex() const { return lastOutputIndex; }
+	// Return the current input device index
+    int getMidiInputIndex() const { return lastInputIndex; }
+
+	// Return the current output device index
+    int getMidiOutputIndex() const { return lastOutputIndex; }
+
+	// Returns whether or not the current device indicies are valid
+	bool hasDevicesDefined() const { return lastInputIndex >= 0 && lastOutputIndex >= 0; }
 
-	// Re-initializes device list in case of changes
-	void refreshDeviceLists();
+	// Returns the index of the given MidiDevice if found, or -1 if not present
+	int getIndexOfInputDevice(MidiDeviceInfo inputDeviceInfo) const { return midiInputs.indexOf(inputDeviceInfo); }
+	int getIndexOfInputDevice(String inputDeviceId) const;
+	// Returns the index of the given MidiDevice if found, or -1 if not present
+	int getIndexOfOutputDevice(MidiDeviceInfo outputDeviceInfo) const { return midiOutputs.indexOf(outputDeviceInfo); }
+	int getIndexOfOutputDevice(String outputDeviceId) const;
+
+	// Re-initializes device list in case of changes, returns true if a change was detected
+	bool refreshDeviceLists();
 
 	// Open the specified input device
 	void setMidiInput(int deviceIndex);
@@ -62,6 +78,20 @@ class HajuMidiDriver : public MidiInputCallback
     // Close current output device
     void closeMidiOutput();
 
+	//============================================================================
+	// Device detection support
+
+	// Refreshes and opens all available MIDI devices
+	void openAvailableDevicesForTesting();
+
+	// Send a message to a specific device
+	void sendTestMessageNow(int outputDeviceIndex, const MidiMessage& message);
+
+	// Closes all open testing devices; either setMidiInput and setMidiOutput will call this if it's not empty
+	void closeTestingDevices();
+
+	bool testIsIncomplete() const { return (testInputs.size() > 0 || testOutputs.size() > 0) && midiInput == nullptr && midiOutput == nullptr; }
+
 	// Attributes
 protected:
 	Array<MidiDeviceInfo> midiInputs;
@@ -70,11 +100,20 @@ class HajuMidiDriver : public MidiInputCallback
     int lastOutputIndex = -1;
 	int lastInputIndex = -1;
 
+	MidiDeviceInfo lastOutputDevice;
+	MidiDeviceInfo lastInputDevice;
+
+	std::unique_ptr<MidiInput> selectedInput;
+	std::unique_ptr<MidiOutput> selectedOutput;
+
 	// Currently open MIDI output
-	std::unique_ptr<MidiOutput> midiOutput;
+	MidiOutput* midiOutput;
 
 	// Last MIDI input opened
-	std::unique_ptr<MidiInput> midiInput;
+	MidiInput* midiInput;
+
+	OwnedArray<MidiOutput> testOutputs;
+	OwnedArray<MidiInput> testInputs;
 };
 
 #endif  // HAJUMIDIDRIVER_H_INCLUDED
diff --git a/Source/IsomorphicMassAssign.cpp b/Source/IsomorphicMassAssign.cpp
index 5fa385d5..75c51f30 100644
--- a/Source/IsomorphicMassAssign.cpp
+++ b/Source/IsomorphicMassAssign.cpp
@@ -387,19 +387,6 @@ void IsomorphicMassAssign::buttonClicked (juce::Button* buttonThatWasClicked)
 
 //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
 
-void IsomorphicMassAssign::lookAndFeelChanged()
-{
-    auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-
-    if (lookAndFeel)
-    {
-        lookAndFeel->setupTextButton(*btnScaleStructureEditor);
-        lookAndFeel->setupComboBox(*cbMappingType);
-        lookAndFeel->setupComboBox(*startingPointBox);
-        lookAndFeel->setupComboBox(*periodSizeBox);
-    }
-}
-
 void IsomorphicMassAssign::restoreStateFromPropertiesFile(PropertiesFile* propertiesFile)
 {
     periodSizeBox->setSelectedId(
@@ -443,7 +430,7 @@ void IsomorphicMassAssign::setSaveSend(int setSelection, int keySelection, int n
 		mainComponent->getMappingInEdit().sets[setSelection].theKeys[keySelection]);
 
 	// Send to device
-	TerpstraSysExApplication::getApp().getMidiDriver().sendKeyParam(setSelection + 1, keySelection,
+	TerpstraSysExApplication::getApp().getLumatoneController().sendKeyParam(setSelection + 1, keySelection,
 		mainComponent->getMappingInEdit().sets[setSelection].theKeys[keySelection]);
 }
 
diff --git a/Source/IsomorphicMassAssign.h b/Source/IsomorphicMassAssign.h
index 8cd2792b..e40e5bee 100644
--- a/Source/IsomorphicMassAssign.h
+++ b/Source/IsomorphicMassAssign.h
@@ -85,7 +85,6 @@ class IsomorphicMassAssign  : public Component,
 
 	bool performMouseDown(int setSelection, int keySelection);
 
-	void lookAndFeelChanged() override;
     //[/UserMethods]
 
     void paint (juce::Graphics& g) override;
diff --git a/Source/KeyboardDataStructure.cpp b/Source/KeyboardDataStructure.cpp
index 7c88c783..ce7fa8fb 100644
--- a/Source/KeyboardDataStructure.cpp
+++ b/Source/KeyboardDataStructure.cpp
@@ -253,7 +253,8 @@ void TerpstraKeyMapping::clearAll()
     // Default values for options
     afterTouchActive = false;
     lightOnKeyStrokes = false;
-    invertFootController = false;
+    invertExpression = false;
+    invertSustain = false;
     expressionControllerSensivity = 0;
 
     clearVelocityIntervalTable();
@@ -338,7 +339,10 @@ void TerpstraKeyMapping::fromStringArray(const StringArray& stringArray)
                 int keyValue = currentLine.substring(pos2 + 1).getIntValue();
                 if (boardIndex >= 0 && boardIndex < NUMBEROFBOARDS) {
                     if (keyIndex >= 0 && keyIndex < 56)
-                        sets[boardIndex].theKeys[keyIndex].keyType = (TerpstraKey::KEYTYPE)keyValue;
+                        if (keyValue >= 1 && keyValue < 5)
+                            sets[boardIndex].theKeys[keyIndex].keyType = (LumatoneKeyType)keyValue;
+                        else
+                            sets[boardIndex].theKeys[keyIndex].keyType = LumatoneKeyType::disabled;
                     else
                         jassert(false);
                 }
@@ -351,7 +355,9 @@ void TerpstraKeyMapping::fromStringArray(const StringArray& stringArray)
         } else if ((pos1 = currentLine.indexOf("LightOnKeyStrokes=")) >= 0) {
             lightOnKeyStrokes = currentLine.substring(pos1 + 18).getIntValue() > 0;
         } else if ((pos1 = currentLine.indexOf("InvertFootController=")) >= 0) {
-            invertFootController = currentLine.substring(pos1 + 21).getIntValue() > 0;
+            invertExpression = currentLine.substring(pos1 + 21).getIntValue() > 0;
+        } else if ((pos1 = currentLine.indexOf("InvertSustain=")) >= 0) {
+            invertSustain = currentLine.substring(pos1 + 21).getIntValue() > 0;
         } else if ((pos1 = currentLine.indexOf("ExprCtrlSensivity=")) >= 0) {
             expressionControllerSensivity = currentLine.substring(pos1 + 18).getIntValue();
         }
@@ -415,7 +421,7 @@ StringArray TerpstraKeyMapping::toStringArray()
             result.add("Chan_" + String(keyIndex) + "=" + String(sets[boardIndex].theKeys[keyIndex].channelNumber));
             //if (sets[boardIndex].theKeys[keyIndex].colour != juce::Colour())
             result.add("Col_" + String(keyIndex) + "=" + sets[boardIndex].theKeys[keyIndex].colour.toDisplayString(false));
-            if (sets[boardIndex].theKeys[keyIndex].keyType != TerpstraKey::noteOnNoteOff)
+            if (sets[boardIndex].theKeys[keyIndex].keyType != LumatoneKeyType::noteOnNoteOff)
                 result.add("KTyp_" + String(keyIndex) + "=" + String(sets[boardIndex].theKeys[keyIndex].keyType));
         }
     }
@@ -423,7 +429,8 @@ StringArray TerpstraKeyMapping::toStringArray()
     // General options
     result.add("AfterTouchActive=" + String(afterTouchActive ? 1 : 0));
     result.add("LightOnKeyStrokes=" + String(lightOnKeyStrokes ? 1 : 0));
-    result.add("InvertFootController=" + String(invertFootController ? 1 : 0));
+    result.add("InvertFootController=" + String(invertExpression ? 1 : 0));
+    result.add("InvertSustain=" + String(invertSustain ? 1 : 0));
     result.add("ExprCtrlSensivity=" + String(expressionControllerSensivity));
 
     // Velocity curve interval table
diff --git a/Source/KeyboardDataStructure.h b/Source/KeyboardDataStructure.h
index eda0ffb4..6ad4484f 100644
--- a/Source/KeyboardDataStructure.h
+++ b/Source/KeyboardDataStructure.h
@@ -10,8 +10,8 @@ Author:  hsstraub
 
 #pragma once
 
-#include "../JuceLibraryCode/JuceHeader.h"
-
+#include <JuceHeader.h>
+#include "LumatoneFirmwareDefinitions.h"
 
 // Mapping of one key
 class TerpstraKey
@@ -19,15 +19,12 @@ class TerpstraKey
 public:
 	typedef juce::Colour COLOURTYPE;
 
-	typedef enum
-	{
-		noteOnNoteOff = 1,
-		continuousController = 2,
-		lumaTouch = 3
-	} KEYTYPE;
-
 public:
 	TerpstraKey() { noteNumber = 0; channelNumber = 0; colour = juce::Colour(); keyType = noteOnNoteOff; };
+	TerpstraKey(LumatoneKeyType newKeyType, int newChannelNumber, int newNoteNumber, COLOURTYPE newColour)
+	{
+		keyType = newKeyType; channelNumber = newChannelNumber; noteNumber = newNoteNumber; colour = newColour;
+	}
 	bool isEmpty() const { return channelNumber == 0; }
 
 	bool operator!=(const TerpstraKey& second) const { return noteNumber != second.noteNumber || channelNumber != second.channelNumber || colour != second.colour || keyType != second.keyType; }
@@ -36,7 +33,7 @@ class TerpstraKey
 	int			noteNumber;
 	int			channelNumber;
 	COLOURTYPE	colour;
-	KEYTYPE		keyType;
+	LumatoneKeyType		keyType;
 };
 
 // Subset of 56 (or 55) keys
@@ -54,14 +51,6 @@ struct TerpstraKeys {
 class TerpstraVelocityCurveConfig
 {
 public:
-	typedef enum
-	{
-		noteOnNoteOff = 1,
-		fader = 2,
-		afterTouch = 3,
-		lumaTouch = 4
-		// ToDo modulation wheel
-	} VelocityCurveType;
 
 	typedef enum
 	{
@@ -71,6 +60,15 @@ class TerpstraVelocityCurveConfig
 		quadraticCurves = 2
 	} EDITSTRATEGYINDEX;
 
+	typedef enum
+	{
+		noteOnNoteOff = 1,
+		fader = 2,
+		afterTouch = 3,
+		lumaTouch = 4
+		// ToDo modulation wheel
+	} VelocityCurveType;
+
 public:
 	TerpstraVelocityCurveConfig();
 	// Default value for the given curve type
@@ -122,7 +120,8 @@ class TerpstraKeyMapping
 	// General options
 	bool afterTouchActive;
 	bool lightOnKeyStrokes;
-	bool invertFootController;
+	bool invertExpression;
+	bool invertSustain;
 	int expressionControllerSensivity;
 
 	// Velocity curves
diff --git a/Source/LumatoneController.cpp b/Source/LumatoneController.cpp
new file mode 100644
index 00000000..793a3c57
--- /dev/null
+++ b/Source/LumatoneController.cpp
@@ -0,0 +1,1072 @@
+/*
+  ==============================================================================
+
+    LumatoneCommandManager.cpp
+    Created: 17 Apr 2021 10:17:31pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "LumatoneController.h"
+#include "Main.h"
+
+
+LumatoneController::LumatoneController()
+    : errorVisualizer(TerpstraSysExApplication::getApp().getLookAndFeel()), deviceMonitor(midiDriver)
+{
+    midiDriver.addListener(this);
+    deviceMonitor.addChangeListener(this);
+}
+
+LumatoneController::~LumatoneController()
+{
+
+}
+
+void LumatoneController::setSysExSendingMode(sysExSendingMode newMode)
+{
+    // Might be worth it to provide further context of commands, such as which ones are mutable or not
+    // And use an automated system for determining whether or not to send a message in live or offline mode
+
+    if (newMode != editingMode)
+    {
+        editingMode = newMode;
+        if (editingMode == sysExSendingMode::offlineEditor)
+        {
+            midiDriver.clearMIDIMessageBuffer();	// ToDo remove only SysEx messages (leave NoteOn/NoteOff)?
+            stopTimer();
+        }
+    }
+
+    midiDriver.restrictToTestMessages(editingMode == sysExSendingMode::offlineEditor);
+}
+
+// Takes a generic firmware version and parses it into a recognized firmware version
+void LumatoneController::setFirmwareVersion(FirmwareVersion firmwareVersionIn)
+{
+    firmwareVersion = firmwareVersionIn;
+    setFirmwareVersion(firmwareSupport.getLumatoneFirmwareVersion(firmwareVersion), false);
+}
+
+// Takes a recognized firmware version
+void LumatoneController::setFirmwareVersion(LumatoneFirmwareVersion lumatoneVersion, bool parseVersion)
+{
+    determinedVersion = lumatoneVersion;
+    octaveSize = firmwareSupport.getOctaveSize(determinedVersion);
+
+    if (parseVersion)
+        firmwareVersion = FirmwareVersion::fromDeterminedVersion(determinedVersion);
+
+    firmwareListeners.call(&FirmwareListener::firmwareRevisionReceived, firmwareVersion);
+}
+
+
+void LumatoneController::setMidiInput(int deviceIndex)
+{
+    midiDriver.setMidiInput(deviceIndex);
+    testCurrentDeviceConnection();
+}
+
+void LumatoneController::setMidiOutput(int deviceIndex)
+{
+    midiDriver.setMidiOutput(deviceIndex);
+    testCurrentDeviceConnection();
+}
+
+void LumatoneController::detectAndConnectToLumatone()
+{
+    deviceMonitor.setDetectDeviceIfDisconnected(true);
+}
+
+void LumatoneController::stopAutoConnection()
+{
+    deviceMonitor.setDetectDeviceIfDisconnected(false);
+}
+
+void LumatoneController::refreshAvailableMidiDevices() 
+{ 
+    if (midiDriver.refreshDeviceLists() && midiDriver.testIsIncomplete())
+        midiDriver.openAvailableDevicesForTesting();
+}
+
+bool LumatoneController::requestFirmwareUpdate(File firmwareFile, FirmwareTransfer::ProcessListener* listenerIn)
+{
+    if (firmwareTransfer == nullptr)
+    {
+        firmwareTransfer.reset(new FirmwareTransfer(midiDriver));
+        firmwareTransfer->addTransferListener(this);
+        firmwareTransfer->addListener(this);
+
+        if (listenerIn != nullptr)
+        {
+            firmwareTransfer->addTransferListener(listenerIn);
+        }
+
+        return firmwareTransfer->requestFirmwareUpdate(firmwareFile.getFullPathName());
+    }
+
+    return false;
+}
+
+/*
+==============================================================================
+Combined (hi-level) commands
+*/
+
+
+void LumatoneController::sendAllParamsOfBoard(int boardIndex, TerpstraKeys boardData)
+{
+    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_11)
+    {
+        for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
+        {
+            auto key = &boardData.theKeys[keyIndex];
+            midiDriver.sendKeyFunctionParameters(boardIndex, keyIndex, key->noteNumber, key->channelNumber, key->keyType);
+            midiDriver.sendKeyLightParameters(boardIndex, keyIndex, key->colour.getRed(), key->colour.getGreen(), key->colour.getBlue());
+        }
+    }
+    else
+    {
+        for (int keyIndex = 0; keyIndex < octaveSize; keyIndex++)
+        {
+            auto key = &boardData.theKeys[keyIndex];
+            midiDriver.sendKeyFunctionParameters(boardIndex, keyIndex, key->noteNumber, key->channelNumber, key->keyType);
+            midiDriver.sendKeyLightParameters_Version_1_0_0(boardIndex, keyIndex, key->colour.getRed() / 2, key->colour.getGreen() / 2, key->colour.getBlue() / 2);
+        }
+    }
+}
+
+void LumatoneController::sendCompleteMapping(TerpstraKeyMapping mappingData)
+{
+    for (int boardIndex = 1; boardIndex <= NUMBEROFBOARDS; boardIndex++)
+        sendAllParamsOfBoard(boardIndex, mappingData.sets[boardIndex - 1]);
+}
+
+void LumatoneController::sendGetMappingOfBoardRequest(int boardIndex)
+{
+    getRedLEDConfig(boardIndex);
+    getGreenLEDConfig(boardIndex);
+    getBlueLEDConfig(boardIndex);
+    getChannelConfig(boardIndex);
+    getNoteConfig(boardIndex);
+    getKeyTypeConfig(boardIndex);
+}
+
+void LumatoneController::sendGetCompleteMappingRequest()
+{
+    for (int boardIndex = 1; boardIndex <= NUMBEROFBOARDS; boardIndex++)
+        sendGetMappingOfBoardRequest(boardIndex);
+}
+
+void LumatoneController::resetVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType)
+{
+    switch (velocityCurveType)
+    {
+    case TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff:
+        resetVelocityConfig();
+        break;
+    case TerpstraVelocityCurveConfig::VelocityCurveType::fader:
+        resetFaderConfig();
+        break;
+    case TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch:
+        resetAftertouchConfig();
+        break;
+    case TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch:
+        resetLumatouchConfig();
+        break;
+    default:
+        jassert(false);
+        break;
+    }
+}
+
+unsigned int LumatoneController::sendTestMessageToDevice(int deviceIndex, unsigned int pingId)
+{
+    if (!midiDriver.testIsIncomplete())
+    {
+        midiDriver.openAvailableDevicesForTesting();
+    }
+
+    int value = (pingId < 0)
+        ? deviceIndex
+        : pingId &= 0xFFFFFFF;
+
+    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_9)
+    {
+        midiDriver.ping(value, deviceIndex);
+    }
+    else
+    {
+        midiDriver.sendGetSerialIdentityRequest(deviceIndex);
+    }
+
+    lastTestDeviceSent = deviceIndex;
+    waitingForTestResponse = true;
+
+    return value;
+}
+
+void LumatoneController::testCurrentDeviceConnection()
+{
+    // On confirmed connection send connection listener message
+    if (midiDriver.hasDevicesDefined())
+    {
+        waitingForTestResponse = true;
+
+        if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_9)
+        {
+            pingLumatone(0xf);
+        }
+
+        else
+        {
+            sendGetSerialIdentityRequest();
+        }
+    }
+    else
+    {
+        currentDevicePairConfirmed = false;
+    }
+}
+
+// Send parametrization of one key to the device
+void LumatoneController::sendKeyParam(int boardIndex, int keyIndex, TerpstraKey keyData)
+{
+    sendKeyConfig(boardIndex, keyIndex, keyData.noteNumber, keyData.channelNumber, keyData.keyType /*, TODO fader cc polarity */);
+    sendKeyColourConfig(boardIndex, keyIndex, keyData.colour);
+    
+}
+
+// Send configuration of a certain look up table
+void LumatoneController::sendTableConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType, const uint8* table)
+{
+    switch (velocityCurveType)
+    {
+    case TerpstraVelocityCurveConfig::VelocityCurveType::fader:
+        setFaderConfig(table);
+        break;
+
+    case TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch:
+        setAftertouchConfig(table);
+        break;
+
+    case TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch:
+        setLumatouchConfig(table);
+        break;
+
+    default:
+        sendVelocityConfig(table);
+    }
+}
+
+//=============================================================================
+// Mid-level firmware functions
+
+// Send note, channel, cc, and fader polarity data
+void LumatoneController::sendKeyConfig(int boardIndex, int keyIndex, int noteOrCCNum, int channel, LumatoneKeyType keyType, bool faderUpIsNull)
+{
+    midiDriver.sendKeyFunctionParameters(boardIndex, keyIndex, noteOrCCNum, channel, keyType, faderUpIsNull);
+}
+
+void LumatoneController::sendKeyColourConfig(int boardIndex, int keyIndex, Colour colour)
+{
+    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_11)
+        midiDriver.sendKeyLightParameters(boardIndex, keyIndex, colour.getRed(), colour.getGreen(), colour.getBlue());
+    else
+        midiDriver.sendKeyLightParameters_Version_1_0_0(boardIndex, keyIndex, colour.getRed() / 2, colour.getGreen() / 2, colour.getBlue() / 2);
+}
+
+
+// Send expression pedal sensivity
+void LumatoneController::sendExpressionPedalSensivity(unsigned char value)
+{
+    midiDriver.sendExpressionPedalSensivity(value);
+}
+
+// Send parametrization of foot controller
+void LumatoneController::sendInvertFootController(bool value)
+{
+    midiDriver.sendInvertFootController(value);
+}
+
+// Colour for macro button in active state
+void LumatoneController::sendMacroButtonActiveColour(String colourAsString)
+{
+    auto c = Colour::fromString(colourAsString);
+    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_11)
+        midiDriver.sendMacroButtonActiveColour(c.getRed(), c.getGreen(), c.getBlue());
+    else
+        midiDriver.sendMacroButtonActiveColour_Version_1_0_0(c.getRed(), c.getGreen(), c.getBlue());
+}
+
+// Colour for macro button in inactive state
+void LumatoneController::sendMacroButtonInactiveColour(String colourAsString)
+{
+    auto c = Colour::fromString(colourAsString);
+    if (determinedVersion >= LumatoneFirmwareVersion::VERSION_1_0_11)
+        midiDriver.sendMacroButtonInactiveColour(c.getRed(), c.getGreen(), c.getBlue());
+    else
+        midiDriver.sendMacroButtonInactiveColour_Version_1_0_0(c.getRed(), c.getGreen(), c.getBlue());
+}
+
+// Send parametrization of light on keystrokes
+void LumatoneController::sendLightOnKeyStrokes(bool value)
+{
+    midiDriver.sendLightOnKeyStrokes(value);
+}
+
+// Send a value for a velocity lookup table
+void LumatoneController::sendVelocityConfig(const uint8 velocityTable[])
+{
+    midiDriver.sendVelocityConfig(velocityTable);
+}
+
+// Save velocity config to EEPROM
+void LumatoneController::saveVelocityConfig()
+{
+    midiDriver.saveVelocityConfig();
+}
+
+void LumatoneController::resetVelocityConfig()
+{
+    midiDriver.resetVelocityConfig();
+}
+
+void LumatoneController::setFaderConfig(const uint8 faderTable[])
+{
+    midiDriver.sendFaderConfig(faderTable);
+}
+
+void LumatoneController::resetFaderConfig()
+{
+    midiDriver.resetFaderConfig();
+}
+
+void LumatoneController::setAftertouchEnabled(bool value)
+{
+    midiDriver.sendAfterTouchActivation(value);
+}
+
+void LumatoneController::startCalibrateAftertouch()
+{
+    midiDriver.sendCalibrateAfterTouch();
+}
+
+void LumatoneController::setAftertouchConfig(const uint8 aftertouchTable[])
+{
+    midiDriver.sendAftertouchConfig(aftertouchTable);
+}
+
+void LumatoneController::resetAftertouchConfig()
+{
+    midiDriver.resetAftertouchConfig();
+}
+
+void LumatoneController::setVelocityIntervalConfig(const int velocityIntervalTable[])
+{
+    midiDriver.sendVelocityIntervalConfig(velocityIntervalTable);
+}
+
+void LumatoneController::getRedLEDConfig(int boardIndex)
+{
+    midiDriver.sendRedLEDConfigRequest(boardIndex);
+}
+
+void LumatoneController::getGreenLEDConfig(int boardIndex)
+{
+    midiDriver.sendGreenLEDConfigRequest(boardIndex);
+}
+
+void LumatoneController::getBlueLEDConfig(int boardIndex)
+{
+    midiDriver.sendBlueLEDConfigRequest(boardIndex);
+}
+
+void LumatoneController::getChannelConfig(int boardIndex)
+{
+    midiDriver.sendChannelConfigRequest(boardIndex);
+}
+
+void LumatoneController::getNoteConfig(int boardIndex)
+{
+    midiDriver.sendNoteConfigRequest(boardIndex);
+}
+
+void LumatoneController::getKeyTypeConfig(int boardIndex)
+{
+    midiDriver.sendKeyTypeConfigRequest(boardIndex);
+}
+
+void LumatoneController::sendVelocityConfigRequest()
+{
+    midiDriver.sendVelocityConfigRequest();
+}
+
+void LumatoneController::sendFaderConfigRequest()
+{
+    midiDriver.sendFaderConfigRequest();
+}
+
+void LumatoneController::sendAftertouchConfigRequest()
+{
+    midiDriver.sendAftertouchConfigRequest();
+}
+
+void LumatoneController::sendVelocityIntervalConfigRequest()
+{
+    midiDriver.sendVelocityIntervalConfigRequest();
+}
+
+// This command is used to read back the serial identification number of the keyboard.
+void LumatoneController::sendGetSerialIdentityRequest()
+{
+    midiDriver.sendGetSerialIdentityRequest();
+}
+
+void LumatoneController::startCalibrateKeys()
+{
+    midiDriver.sendCalibrateKeys();
+}
+
+void LumatoneController::setCalibratePitchModWheel(bool startCalibration)
+{
+    midiDriver.sendCalibratePitchModWheel(startCalibration);
+}
+
+void LumatoneController::setLumatouchConfig(const uint8 lumatouchTable[])
+{
+    midiDriver.setLumatouchConfig(lumatouchTable);
+}
+
+void LumatoneController::resetLumatouchConfig()
+{
+    midiDriver.resetLumatouchConfig();
+}
+
+void LumatoneController::getLumatouchConfig()
+{
+    midiDriver.sendLumatouchConfigRequest();
+}
+
+// This command is used to read back the current Lumatone firmware revision.
+void LumatoneController::sendGetFirmwareRevisionRequest()
+{
+    midiDriver.sendGetFirmwareRevisionRequest();
+}
+
+// Send a value for the Lumatone to echo back; used for auto device connection and monitoring
+int LumatoneController::pingLumatone(uint8 pingId)
+{
+    return midiDriver.ping(pingId);
+}
+
+void LumatoneController::invertSustainPedal(bool setInverted)
+{
+    midiDriver.sendInvertSustainPedal(setInverted);
+}
+
+//=============================================================================
+// Communication and broadcasting
+
+void LumatoneController::midiMessageReceived(MidiInput* source, const MidiMessage& midiMessage)
+{
+    // Todo: no listener calling in this method
+    //{
+    //    const MessageManagerLock mml;
+    //    midiListeners.call(&MidiListener::handleMidiMessage, midiMessage);
+    //}
+
+    if (midiMessage.isSysEx())
+    {
+        if (editingMode != sysExSendingMode::firmwareUpdate)
+        {
+            // Handle SysEx responses off of high-precision thread
+            responseQueue.addEvent(midiMessage, sampleNum++);
+
+            if (!bufferReadRequested)
+            {
+                bufferReadRequested = true;
+                startTimer(bufferReadTimeoutMs);
+            }
+        }
+        else if (midiMessage.isSysEx())
+        {
+            auto sysExData = midiMessage.getSysExData();
+            switch (sysExData[CMD_ID])
+            {
+            case GET_FIRMWARE_REVISION:
+                midiDriver.unpackGetFirmwareRevisionResponse(midiMessage, incomingVersion.major, incomingVersion.minor, incomingVersion.revision);
+                if (incomingVersion.isValid()) // Keyboard will return 0.0.0 before fully booted
+                {
+                    waitingForTestResponse = false;
+                    startTimer(UPDATETIMEOUT);
+                }
+                break;
+
+            default:
+                break;
+            }
+        }
+    }
+    else
+    {
+
+    }
+}
+
+void LumatoneController::midiMessageSent(const MidiMessage& midiMessage)
+{
+
+}
+
+void LumatoneController::midiSendQueueSize(int queueSize)
+{
+
+}
+
+void LumatoneController::generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel)
+{
+
+}
+
+void LumatoneController::noAnswerToMessage(const MidiMessage& midiMessage)
+{
+    // Safeguard for getSysExData()
+    if (midiMessage.isSysEx())
+    {        
+        firmwareListeners.call(&FirmwareListener::noAnswerToCommand, midiMessage.getSysExData()[CMD_ID]);
+    }
+}
+
+FirmwareSupport::Error LumatoneController::handleOctaveConfigResponse(
+    const MidiMessage& midiMessage, 
+    std::function < FirmwareSupport::Error(const MidiMessage&, int&, uint8, int*)> unpackFunction,
+    std::function <void(int,void*)> callbackFunctionIfNoError)
+{
+    int boardId = -1;
+    int channelData[56];
+    
+    auto errorCode = unpackFunction(midiMessage, boardId, octaveSize, channelData);
+    if (errorCode == FirmwareSupport::Error::noError)
+    {
+        callbackFunctionIfNoError(boardId, channelData);
+    }
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneController::handleTableConfigResponse(
+    const MidiMessage& midiMessage,
+    std::function<FirmwareSupport::Error(const MidiMessage&, int*)> unpackFunction,
+    std::function <void(void*)> callbackFunctionIfNoError)
+{
+    int veloctiyData[128];
+    auto errorCode = unpackFunction(midiMessage, veloctiyData);
+    if (errorCode == FirmwareSupport::Error::noError)
+        callbackFunctionIfNoError(veloctiyData);
+    
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneController::handleLEDConfigResponse(const MidiMessage& midiMessage)
+{
+    int boardId = -1;
+    int colourData[56];
+
+    int cmd = firmwareSupport.getCommandNumber(midiMessage);
+    FirmwareSupport::Error errorCode;
+
+    // Use correct unpacking function
+    if (determinedVersion < LumatoneFirmwareVersion::VERSION_1_0_11)
+    {
+        errorCode = midiDriver.unpackGetLEDConfigResponse_Version_1_0_0(midiMessage, boardId, octaveSize, colourData);
+    }
+    else
+    {
+        errorCode = midiDriver.unpackGetLEDConfigResponse(midiMessage, boardId, colourData);
+    }
+
+    if (errorCode == FirmwareSupport::Error::noError)
+    {
+        int colorCode = cmd - GET_RED_LED_CONFIG;
+        firmwareListeners.call(&FirmwareListener::octaveColourConfigReceived, boardId, colorCode, colourData);
+    }
+    
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneController::handleChannelConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int& boardId, uint8 numKeys, int* data) {
+        auto errorCode = midiDriver.unpackGetChannelConfigResponse(msg, boardId, numKeys, data);
+        if (errorCode == FirmwareSupport::Error::noError)
+            for (int i = 0; i < numKeys; i++)
+                data[i]++; // MIDI Channels are 1-based
+        return errorCode;
+    };
+    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&FirmwareListener::octaveChannelConfigReceived, boardId, (int*)data); };
+    return handleOctaveConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handleNoteConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int& boardId, uint8 numKeys, int* data) {
+        return midiDriver.unpackGetNoteConfigResponse(msg, boardId, numKeys, data);
+    };
+    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&FirmwareListener::octaveNoteConfigReceived, boardId, (int*)data); };
+    return handleOctaveConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handleKeyTypeConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int& boardId, uint8 numKeys, int* data) {
+        return midiDriver.unpackGetTypeConfigResponse(msg, boardId, numKeys, data);
+    };
+    auto callback = [&](int boardId, void* data) { firmwareListeners.call(&FirmwareListener::keyTypeConfigReceived, boardId, (int*)data); };
+    return handleOctaveConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handleVelocityConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int* data) {
+        return midiDriver.unpackGetVelocityConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&FirmwareListener::velocityConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handleAftertouchConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int* data) {
+        return midiDriver.unpackGetAftertouchConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&FirmwareListener::aftertouchConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handleVelocityIntervalConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int* data) {
+        return midiDriver.unpackGetVelocityIntervalConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&FirmwareListener::velocityIntervalConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handleFaderConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int* data) {
+        return midiDriver.unpackGetFaderConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&FirmwareListener::faderConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handleSerialIdentityResponse(const MidiMessage& midiMessage)
+{
+    int serialBytes[6];
+    auto errorCode = midiDriver.unpackGetSerialIdentityResponse(midiMessage, serialBytes);
+    if (errorCode != FirmwareSupport::Error::noError)
+        return errorCode;
+
+    connectedSerialNumber = firmwareSupport.serialIdentityToString(serialBytes);
+    DBG("Device serial is: " + connectedSerialNumber);
+
+    testResponseReceived();
+
+    firmwareListeners.call(&FirmwareListener::serialIdentityReceived, lastTestDeviceResponded, serialBytes);
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneController::handleFirmwareRevisionResponse(const MidiMessage& midiMessage)
+{
+    int major, minor, revision;
+    auto errorCode = midiDriver.unpackGetFirmwareRevisionResponse(midiMessage, major, minor, revision);
+    if (errorCode == FirmwareSupport::Error::noError)
+    {
+        // Listener call handled here
+        setFirmwareVersion(FirmwareVersion(major, minor, revision));
+    }
+
+    return errorCode;
+}
+
+FirmwareSupport::Error LumatoneController::handleLumatouchConfigResponse(const MidiMessage& midiMessage)
+{
+    auto unpack = [&](const MidiMessage& msg, int* data) {
+        return midiDriver.unpackGetLumatouchConfigResponse(msg, data);
+    };
+    auto callback = [&](void* data) { firmwareListeners.call(&FirmwareListener::lumatouchConfigReceived, (int*)data); };
+    return handleTableConfigResponse(midiMessage, unpack, callback);
+}
+
+FirmwareSupport::Error LumatoneController::handlePingResponse(const MidiMessage& midiMessage)
+{
+    unsigned int value = 0;
+    auto errorCode = midiDriver.unpackPingResponse(midiMessage, value);
+    
+    if (errorCode != FirmwareSupport::Error::noError)
+        return errorCode;
+
+    testResponseReceived();
+
+    firmwareListeners.call(&FirmwareListener::pingResponseReceived, lastTestDeviceResponded, value);
+
+    return errorCode;
+}
+
+void LumatoneController::handleMidiDriverError(FirmwareSupport::Error errorToHandle, int commandReceived)
+{
+    DBG("ERROR: " + firmwareSupport.errorToString(errorToHandle));
+
+    // Generic handling
+    if (commandReceived < CHANGE_KEY_NOTE)
+    {
+
+    }
+    
+    // Command specific
+    else
+    {
+        switch (errorToHandle) {
+            case FirmwareSupport::Error::messageIsAnEcho:
+                return;
+                
+            case FirmwareSupport::Error::messageHasInvalidStatusByte:
+                return;
+
+            default:
+                break;
+        }
+    }
+    
+    jassertfalse;
+}
+
+void LumatoneController::firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg)
+{
+    switch (statusCode)
+    {
+    case FirmwareTransfer::StatusCode::SessionBegin:
+        midiDriver.clearMIDIMessageBuffer();
+        deviceMonitor.stopMonitoringDevice();
+        waitingForTestResponse = false; // In case connection test was in progress
+        break;
+
+    case FirmwareTransfer::StatusCode::InstallBegin:
+        editingMode = sysExSendingMode::firmwareUpdate;
+        startTimer(UPDATETIMEOUT);
+        break;
+            
+    default:
+        if (statusCode < FirmwareTransfer::StatusCode::NoErr)
+            deviceMonitor.intializeConnectionLossDetection();
+        break;
+    }
+}
+
+void LumatoneController::timerCallback()
+{
+    stopTimer();
+
+    if (editingMode != firmwareUpdate)
+    {
+        if (readSample >= sampleNum)
+        {
+            sampleNum = 0;
+            readSample = 0;
+            responseQueue.clear();
+        }
+        else
+        {
+            MidiBuffer readBuffer;
+            readBuffer.addEvents(responseQueue, readSample, bufferReadSize, 0);
+            int maxSample = readSample + bufferReadSize;
+            for (auto event : readBuffer)
+            {
+                auto midiMessage = event.getMessage();
+                DBG("READING: " + midiMessage.getDescription());
+                if (midiMessage.isSysEx())
+                {
+                    auto errorCode = FirmwareSupport::Error::noError;
+                    auto sysExData = midiMessage.getSysExData();
+
+                    switch (sysExData[MSG_STATUS])
+                    {
+                    case TerpstraMIDIAnswerReturnCode::NACK:  // Not recognized
+                        errorVisualizer.setErrorLevel(
+                            HajuErrorVisualizer::ErrorLevel::error,
+                            "Not Recognized");
+                        errorCode = FirmwareSupport::Error::unknownCommand;
+                        break;
+
+                    case TerpstraMIDIAnswerReturnCode::ACK:  // Acknowledged, OK
+                        errorVisualizer.setErrorLevel(
+                            HajuErrorVisualizer::ErrorLevel::noError,
+                            "Ack");
+                        break;
+
+                    case TerpstraMIDIAnswerReturnCode::BUSY: // Controller busy
+                        errorVisualizer.setErrorLevel(
+                            HajuErrorVisualizer::ErrorLevel::warning,
+                            "Busy");
+                        errorCode = FirmwareSupport::Error::deviceIsBusy;
+                        break;
+
+                    case TerpstraMIDIAnswerReturnCode::ERROR:    // Error
+                        errorVisualizer.setErrorLevel(
+                            HajuErrorVisualizer::ErrorLevel::error,
+                            "Error from device");
+                        errorCode = FirmwareSupport::Error::externalError;
+                        break;
+
+                    case TEST_ECHO:
+                        errorCode = FirmwareSupport::Error::messageIsAnEcho;
+                        break;
+
+                    default:
+                        errorVisualizer.setErrorLevel(
+                            HajuErrorVisualizer::ErrorLevel::noError,
+                            "");
+                        break;
+                    }
+
+                    unsigned int cmd = sysExData[CMD_ID];
+
+                    if (errorCode == FirmwareSupport::Error::noError)
+                    {
+                        switch (cmd)
+                        {
+                        case GET_RED_LED_CONFIG:
+                            errorCode = handleLEDConfigResponse(midiMessage);
+                            break;
+
+                        case GET_GREEN_LED_CONFIG:
+                            errorCode = handleLEDConfigResponse(midiMessage);
+                            break;
+
+                        case GET_BLUE_LED_CONFIG:
+                            errorCode = handleLEDConfigResponse(midiMessage);
+                            break;
+
+                        case GET_CHANNEL_CONFIG:
+                            errorCode = handleChannelConfigResponse(midiMessage);
+                            break;
+
+                        case GET_NOTE_CONFIG:
+                            errorCode = handleNoteConfigResponse(midiMessage);
+                            break;
+
+                        case GET_KEYTYPE_CONFIG:
+                            errorCode = handleKeyTypeConfigResponse(midiMessage);
+                            break;
+
+                            // TODO
+
+                        case GET_VELOCITY_CONFIG:
+                            errorCode = handleVelocityConfigResponse(midiMessage);
+                            break;
+
+                        case GET_SERIAL_IDENTITY:
+                            errorCode = handleSerialIdentityResponse(midiMessage);
+                            break;
+
+                        case GET_LUMATOUCH_CONFIG:
+                            errorCode = handleLumatouchConfigResponse(midiMessage);
+                            break;
+
+                        case GET_FIRMWARE_REVISION:
+                            errorCode = handleFirmwareRevisionResponse(midiMessage);
+                            break;
+
+                        case LUMA_PING:
+                            errorCode = handlePingResponse(midiMessage);
+                            break;
+
+                        default:
+                            if (sysExData[MSG_STATUS] == 1)
+                            {
+                                if (event.numBytes > 8)
+                                    DBG("WARNING UNIMPLEMENTED RESPONSE HANDLING CMD " + String(cmd));
+                            }
+                            else
+                            {
+                                DBG("UNHANDLED EXCEPTION");
+                            }
+                        }
+                    }
+
+                    if (errorCode != FirmwareSupport::Error::noError)
+                    {
+                        handleMidiDriverError(errorCode, cmd);
+                    }
+
+                }
+                readSample++;
+                jassert(readSample <= sampleNum);
+            }
+
+            if (maxSample < sampleNum)
+                startTimer(bufferReadTimeoutMs);
+        }
+    }
+    else
+    {
+        if (firmwareTransfer != nullptr)
+        {
+            if (editingMode == sysExSendingMode::firmwareUpdate)
+            {
+                firmwareTransfer->incrementProgress();
+
+                if (!waitingForTestResponse)
+                {
+                    waitingForTestResponse = true;
+                    midiDriver.closeMidiInput();
+                    midiDriver.closeMidiOutput();
+                    deviceMonitor.initializeDeviceDetection();
+                }
+                else if (midiDriver.hasDevicesDefined())
+                {
+                    onFirmwareUpdateReceived();
+                }
+                
+                // THIS IS A KLUDGE; Something kills DeviceActivityMonitor's timer after device comes back online and I'm not yet sure why - vsicurella
+                else if (!deviceMonitor.isTimerRunning())
+                {
+                    deviceMonitor.initializeDeviceDetection();
+                }
+
+                startTimer(UPDATETIMEOUT);
+            }
+        }
+        else
+        {
+            AlertWindow::showMessageBox(
+                AlertWindow::AlertIconType::WarningIcon,
+                "Firmware update not confirmed",
+                "Your Lumatone appears to still be updating, or may have been disconnected. Make sure Lumatone is powered on and connected, and the when Lumatone is ready it will connect successfully.",
+                "Ok"); 
+
+            onDisconnection();
+        }
+    }
+
+    bufferReadRequested = false;
+}
+
+void LumatoneController::exitSignalSent()
+{
+    firmwareTransfer->waitForThreadToExit(20);
+    firmwareTransfer = nullptr;
+}
+
+void LumatoneController::changeListenerCallback(ChangeBroadcaster* source)
+{
+    if (source == &deviceMonitor)
+    {
+        if (!midiDriver.hasDevicesDefined())
+        {
+            int newInput = deviceMonitor.getConfirmedInputIndex();
+            int newOutput = deviceMonitor.getConfirmedOutputIndex();
+
+            currentDevicePairConfirmed = false;
+
+            if (newInput >= 0 && newOutput >= 0)
+            {
+                midiDriver.setMidiInput(newInput);
+                midiDriver.setMidiOutput(newOutput);
+                currentDevicePairConfirmed = true;
+            }
+        }
+        else if (deviceMonitor.isConnectionEstablished())
+        {
+            currentDevicePairConfirmed = true;
+        }
+        else
+        {
+            currentDevicePairConfirmed = false;
+        }
+        
+        if (currentDevicePairConfirmed)
+            onConnectionConfirmed(editingMode != sysExSendingMode::firmwareUpdate);
+        else
+            onDisconnection();
+
+    }
+}
+
+void LumatoneController::testResponseReceived()
+{
+    if (waitingForTestResponse)
+    {
+        waitingForTestResponse = false;
+
+        if (!currentDevicePairConfirmed)
+        {
+            currentDevicePairConfirmed = true;
+            onConnectionConfirmed(true);
+        }
+    }
+}
+
+void LumatoneController::onConnectionConfirmed(bool sendChangeSignal)
+{
+    if (sendChangeSignal)
+        statusListeners.call(&StatusListener::connectionEstablished, midiDriver.getMidiInputIndex(), midiDriver.getMidiOutputIndex());
+
+    // Identity returned on 55-keys version
+    if (connectedSerialNumber == SERIAL_55_KEYS)
+        setFirmwareVersion(LumatoneFirmwareVersion::VERSION_55_KEYS);
+    
+    deviceMonitor.intializeConnectionLossDetection();
+
+    TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastInputDeviceId", midiDriver.getLastMidiInputInfo().identifier);
+    TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastOutputDeviceId", midiDriver.getLastMidiOutputInfo().identifier);
+}
+
+void LumatoneController::onDisconnection()
+{
+    midiDriver.closeMidiInput();
+    midiDriver.closeMidiOutput();
+    
+    waitingForTestResponse = false;
+    currentDevicePairConfirmed = false;
+    lastTestDeviceResponded = -1;
+    lastTestDeviceSent = -1;
+
+    statusListeners.call(&StatusListener::connectionLost);
+    
+    deviceMonitor.initializeDeviceDetection();
+}
+
+void LumatoneController::onFirmwareUpdateReceived()
+{
+    jassert(firmwareTransfer != nullptr && editingMode == sysExSendingMode::firmwareUpdate);
+
+    if (firmwareTransfer != nullptr)
+    {
+        firmwareTransfer->setProgress(1.0);
+        auto possibleUpdate = firmwareSupport.getLumatoneFirmwareVersion(incomingVersion);
+        DBG("Waiting for update, received: " + incomingVersion.toString());
+        if (possibleUpdate > determinedVersion)
+        {
+            firmwareVersion = incomingVersion;
+            DBG("Confirmed update to firmware version " + firmwareVersion.toString());
+            determinedVersion = possibleUpdate;
+        }
+        else
+        {
+            DBG("Error: Firmware update appears to have failed");
+            //jassertfalse;
+        }
+
+        editingMode = sysExSendingMode::liveEditor;
+        firmwareListeners.call(&FirmwareListener::firmwareRevisionReceived, firmwareVersion);
+        firmwareTransfer->signalThreadShouldExit();
+
+        deviceMonitor.intializeConnectionLossDetection();
+    }
+}
+
diff --git a/Source/LumatoneController.h b/Source/LumatoneController.h
new file mode 100644
index 00000000..f4ae1ec3
--- /dev/null
+++ b/Source/LumatoneController.h
@@ -0,0 +1,407 @@
+/*
+  ==============================================================================
+
+    LumatoneCommandManager.h
+    Created: 17 Apr 2021 10:17:31pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include "KeyboardDataStructure.h"
+#include "TerpstraMidiDriver.h"
+#include "DeviceActivityMonitor.h"
+#include "FirmwareTransfer.h"
+
+//==============================================================================
+// Helper class for parsing and comparing (todo) firmware versions
+
+
+
+class LumatoneController :  protected TerpstraMidiDriver::Listener, 
+                            protected FirmwareTransfer::ProcessListener,
+                            private juce::Thread::Listener,
+                            private juce::Timer, 
+                            private juce::ChangeListener
+{
+public:
+
+    enum sysExSendingMode
+    {
+        liveEditor = 0,
+        offlineEditor = 1,
+        firmwareUpdate = 2
+    };
+
+public:
+
+    LumatoneController();
+    ~LumatoneController();
+
+    //============================================================================
+    // Methods to configure firmware communication parameters
+
+    sysExSendingMode getSysExSendingMode() const { return editingMode; }
+    void setSysExSendingMode(sysExSendingMode newMode);
+
+    FirmwareVersion getFirmwareVersion() const { return firmwareVersion; }
+
+    LumatoneFirmwareVersion getConfirmedVersion() const { return determinedVersion; }
+    
+    // Takes a generic firmware version and parses it into a recognized firmware version
+    void setFirmwareVersion(FirmwareVersion firmwareVersionIn);
+
+    // Takes a recognized firmware version
+    void setFirmwareVersion(LumatoneFirmwareVersion lumatoneVersion, bool parseVersion = true);
+
+    int getOctaveSize() const { return octaveSize; }
+
+    void refreshAvailableMidiDevices();
+
+    Array<MidiDeviceInfo> getMidiInputList() { return midiDriver.getMidiInputList(); }
+    Array<MidiDeviceInfo> getMidiOutputList() { return midiDriver.getMidiOutputList(); }
+
+    int getMidiInputIndex() const { return midiDriver.getMidiInputIndex(); }
+    int getMidiOutputIndex() const { return midiDriver.getMidiOutputIndex(); }
+
+    void setMidiInput(int deviceIndex);
+    void setMidiOutput(int deviceIndex);
+
+    bool isConnected() const { return midiDriver.hasDevicesDefined() && currentDevicePairConfirmed; }
+
+    bool requestFirmwareUpdate(File firmwareFile, FirmwareTransfer::ProcessListener* listenerIn = nullptr);
+
+    // Auto-connection and monitoring 
+
+    void detectAndConnectToLumatone();
+    void stopAutoConnection();
+
+    bool isDetectingLumatone() const { return deviceMonitor.willDetectDeviceIfDisconnected() && !deviceMonitor.isConnectionEstablished(); }
+    void setDeviceDetectionTimeout(int responseTimeoutMs) { deviceMonitor.setResponseTimeoutMs(responseTimeoutMs); }
+
+    bool willCheckConnectionWhenInactvie() const { return deviceMonitor.willCheckForInactivity(); }
+    void checkConnectionWhenInactive(bool checkWhenInactive) { deviceMonitor.setCheckForInactivity(checkWhenInactive); }
+
+    //============================================================================
+    // Combined (hi-level) commands
+
+    // Send all parametrizations of one sub board
+    void sendAllParamsOfBoard(int boardIndex, TerpstraKeys boardData);
+
+    // Send and save a complete key mapping
+    void sendCompleteMapping(TerpstraKeyMapping mappingData);
+
+    // Send request to receive the current mapping of one sub board on the controller
+    void sendGetMappingOfBoardRequest(int boardIndex);
+
+    // Send request to receive the complete current mapping on the controller
+    void sendGetCompleteMappingRequest();
+
+    // Send parametrization of one key to the device
+    void sendKeyParam(int boardIndex, int keyIndex, TerpstraKey keyData);
+
+    // Send configuration of a certain look up table
+    void sendTableConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType, const uint8* table);
+
+    // Reset configuration of a certain look up table to factory settings
+    void resetVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType);
+
+    // Ping a device cached in the device list, will primarily use GetSerialIdentity, or Ping if determined version happens to be >= 1.0.9
+    unsigned int sendTestMessageToDevice(int deviceIndex, unsigned int pingId);
+
+    // Sends a generic test message to the current device pair to see if we get an expected response
+    void testCurrentDeviceConnection();
+
+    //============================================================================
+    // Single (mid-level) commands
+
+    // Send note, channel, cc, and fader polarity data
+    void sendKeyConfig(int boardIndex, int keyIndex, int noteOrCCNum, int channel, LumatoneKeyType keyType, bool faderUpIsNull = true);
+
+    void sendKeyColourConfig(int boardIndex, int keyIndex, Colour colour);
+
+    // Send expression pedal sensivity
+    void sendExpressionPedalSensivity(unsigned char value);
+
+    // Send parametrization of foot controller
+    void sendInvertFootController(bool value);
+
+    // Colour for macro button in active state
+    void sendMacroButtonActiveColour(String colourAsString);
+
+    // Colour for macro button in inactive state
+    void sendMacroButtonInactiveColour(String colourAsString);
+
+    // Send parametrization of light on keystrokes
+    void sendLightOnKeyStrokes(bool value);
+
+    // Send a value for a velocity lookup table
+    void sendVelocityConfig(const uint8 velocityTable[]);
+
+    // Save velocity config to EEPROM
+    void saveVelocityConfig();
+
+    void resetVelocityConfig();
+
+    void setFaderConfig(const uint8 faderTable[]);
+
+    void resetFaderConfig();
+
+    void setAftertouchEnabled(bool isEnabled);
+
+    void startCalibrateAftertouch();
+
+    void setAftertouchConfig(const uint8 aftertouchTable[]);
+
+    void resetAftertouchConfig();
+
+    void setCalibratePitchModWheel(bool startCalibration);
+
+    void setVelocityIntervalConfig(const int velocityIntervalTable[]);
+
+    void getRedLEDConfig(int boardIndex);
+
+    void getGreenLEDConfig(int boardIndex);
+
+    void getBlueLEDConfig(int boardIndex);
+
+    void getChannelConfig(int boardIndex);
+
+    void getNoteConfig(int boardIndex);
+
+    void getKeyTypeConfig(int boardIndex);
+
+    void sendVelocityConfigRequest();
+
+    // CMD 1Eh: Read back the current fader look up table of the keyboard.
+    void sendFaderConfigRequest();
+
+    // CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
+    void sendAftertouchConfigRequest();
+
+    void sendVelocityIntervalConfigRequest();
+
+    // This command is used to read back the serial identification number of the keyboard.
+    void sendGetSerialIdentityRequest();
+
+    void startCalibrateKeys();
+
+    void setLumatouchConfig(const uint8 lumatouchTable[]);
+
+    void resetLumatouchConfig();
+
+    void getLumatouchConfig();
+
+    // This command is used to read back the current Lumatone firmware revision.
+    void sendGetFirmwareRevisionRequest();
+
+    // Send a value from 0-127 for the Lumatone to echo back, returns actual value sent (in case of 7-bit masking); used for auto device connection and monitoring
+    int pingLumatone(uint8 pingId);
+
+    // Invert the polarity of the sustain pedal
+    void invertSustainPedal(bool setInverted);
+
+    //============================================================================
+    // FirmwareTransfer::Listener
+
+    void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg) override;
+
+    void exitSignalSent() override;
+    
+    //============================================================================
+    // juce::Timer implementation
+
+    void timerCallback() override;
+    
+    //============================================================================
+    // juce::ChangeListener implementation
+
+    void changeListenerCallback(ChangeBroadcaster* source) override;
+
+protected:
+    //============================================================================
+    // Implementation of TerpstraMidiDriver::Listener
+
+    virtual void midiMessageReceived(MidiInput* source, const MidiMessage& midiMessage) override;
+
+    virtual void midiMessageSent(const MidiMessage& midiMessage) override;
+
+    virtual void midiSendQueueSize(int queueSize) override;
+
+    virtual void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override;
+
+    virtual void noAnswerToMessage(const MidiMessage& midiMessage) override;
+
+public:
+    //============================================================================
+    // Public interface for Lumatone connection status
+
+    class StatusListener
+    {
+    public:
+
+        virtual void connectionEstablished(int inputMidiDevice, int outputMidiDevice) {};
+        virtual void connectionLost() {};
+    };
+
+    ListenerList<StatusListener> statusListeners;
+    void    addStatusListener(StatusListener* listenerIn) { statusListeners.add(listenerIn); }
+    void removeStatusListener(StatusListener* listenerIn) { statusListeners.remove(listenerIn); }
+
+private:
+    
+    void testResponseReceived();
+
+    void onConnectionConfirmed(bool sendChangeSignal);
+    void onDisconnection();
+    void onFirmwareUpdateReceived();
+
+public:
+    //============================================================================
+    // Public interface for Lumatone firmware communication
+    class FirmwareListener
+    {
+    public:
+
+        // rgbFlag uses 0 for red, 1 for green, 2 for blue
+        virtual void octaveColourConfigReceived(int octaveIndex, uint8 rgbFlag, const int* colourData) {};
+
+        virtual void octaveChannelConfigReceived(int octaveIndex, const int* channelData) {};
+
+        virtual void octaveNoteConfigReceived(int octaveIndex, const int* noteData) {};
+
+        virtual void keyTypeConfigReceived(int octaveIndex, const int* keyTypeData) {};
+
+        virtual void velocityConfigReceived(const int* velocityData) {};
+
+        virtual void aftertouchConfigReceived(const int* aftertouch) {};
+
+        virtual void velocityIntervalConfigReceived(const int* velocityData) {};
+
+        virtual void faderConfigReceived(const int* faderData) {};
+
+        virtual void serialIdentityReceived(int inputDeviceIndex, const int* serialBytes) {};
+
+        virtual void lumatouchConfigReceived(const int* lumatouchData) {};
+
+        virtual void firmwareRevisionReceived(FirmwareVersion version) {};
+
+        virtual void pingResponseReceived(int inputDeviceIndex, unsigned int pingValue) {};
+
+        virtual void peripheralMidiChannelsReceived(int pitchWheelChannel, int modWheelChannel, int expressionChannel, int sustainPedalChannel) {};
+
+        virtual void pedalCalibrationDataReceived(int minBound, int maxBound, bool pedalIsActive) {};
+
+        virtual void wheelsCalibrationDataReceived(int minPitch, int maxPitch, int minMod, int maxMod) {};
+
+        virtual void noAnswerToCommand(int cmd) {};
+    };
+
+    ListenerList<FirmwareListener> firmwareListeners;
+
+    void    addFirmwareListener(FirmwareListener* listenerIn) { firmwareListeners.add(listenerIn); }
+    void removeFirmwareListener(FirmwareListener* listenerIn) { firmwareListeners.remove(listenerIn); }
+
+
+    class EditorListener
+    {
+    public:
+
+        virtual void keyFunctionConfigurationChanged(int octaveNumber, int keyNumber, int noteOrCC, int midiChannel, LumatoneKeyType keyType, bool faderUpIsNull) {};
+
+        virtual void keyColourConfigurationChanged(int octaveNumber, int keyNumber, Colour keyColour) {};
+    };
+
+    ListenerList<EditorListener> editorListeners;
+
+    void    addEditorListener(EditorListener* listenerIn) { editorListeners.add(listenerIn); }
+    void removeEditorListener(EditorListener* listenerIn) { editorListeners.remove(listenerIn); }
+
+    class MidiListener
+    {
+    public:
+
+        virtual void handleMidiMessage(const MidiMessage& msg) = 0;
+    };
+
+    ListenerList<MidiListener> midiListeners;
+
+    void    addMidiListener(MidiListener* listenerIn) { midiListeners.add(listenerIn); }
+    void removeMidiListener(MidiListener* listenerIn) { midiListeners.remove(listenerIn); }
+
+private:
+    //============================================================================
+    // Lower-level message unpacking and handling
+
+    FirmwareSupport::Error handleOctaveConfigResponse(
+        const MidiMessage& midiMessage, 
+        std::function <FirmwareSupport::Error(const MidiMessage&, int&, uint8, int*)> unpackFunction,
+        std::function <void(int,void*)> callbackFunctionIfNoError = {}
+    );
+
+    FirmwareSupport::Error handleTableConfigResponse(
+        const MidiMessage& midiMessage,
+        std::function<FirmwareSupport::Error(const MidiMessage&, int*)> unpackFunction,
+        std::function <void(void*)> callbackFunctionIfNoError = {}
+    );
+
+    FirmwareSupport::Error handleLEDConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleChannelConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleNoteConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleKeyTypeConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleVelocityConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleAftertouchConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleVelocityIntervalConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleFaderConfigResponse(const MidiMessage& midiMessage);
+    
+    FirmwareSupport::Error handleSerialIdentityResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleFirmwareRevisionResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handleLumatouchConfigResponse(const MidiMessage& midiMessage);
+
+    FirmwareSupport::Error handlePingResponse(const MidiMessage& midiMessage);
+
+    void handleMidiDriverError(FirmwareSupport::Error errorToHandle, int commandReceived = -1);
+
+private:
+
+    CriticalSection             criticalSection;
+
+    FirmwareSupport             firmwareSupport;
+
+    String                      connectedSerialNumber;
+    LumatoneFirmwareVersion     determinedVersion = LumatoneFirmwareVersion::NO_VERSION;
+    FirmwareVersion             firmwareVersion = { 0, 0, 0 };
+    FirmwareVersion             incomingVersion = { 0, 0, 0 };
+    int                         octaveSize = 56;
+
+    HajuErrorVisualizer         errorVisualizer;
+    TerpstraMidiDriver          midiDriver;
+    DeviceActivityMonitor       deviceMonitor;
+
+    std::unique_ptr<FirmwareTransfer> firmwareTransfer;
+
+    MidiBuffer                  responseQueue;
+    int                         readSample = 0;
+    int                         sampleNum = 0;
+    const int                   bufferReadTimeoutMs = 50;
+    const int                   bufferReadSize = 16;
+    bool                        bufferReadRequested = false;
+
+    int                         lastTestDeviceSent = -1;
+    int                         lastTestDeviceResponded = -1;
+    bool                        waitingForTestResponse = false;
+    bool                        currentDevicePairConfirmed = false;
+    
+    LumatoneController::sysExSendingMode editingMode = sysExSendingMode::offlineEditor;
+};
diff --git a/Source/LumatoneEditorLookAndFeel.h b/Source/LumatoneEditorLookAndFeel.h
index 76b6d5e8..b2e4d2a2 100644
--- a/Source/LumatoneEditorLookAndFeel.h
+++ b/Source/LumatoneEditorLookAndFeel.h
@@ -32,7 +32,9 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         if (doImageCache)
         {
             cacheImages();
+            cacheIcons();
         }
+
     }
 
     Font getAppFont(LumatoneEditorFont fontIdIn)
@@ -286,48 +288,101 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
             int bkgdColourId = (shouldDrawButtonAsDown) ? TextButton::ColourIds::buttonOnColourId : TextButton::ColourIds::buttonColourId;
             drawButtonBackground(g, btn, btn.findColour(bkgdColourId), shouldDrawButtonAsHighlighted, shouldDrawButtonAsDown);
 
+            int colourId = shouldDrawButtonAsDown ? TextButton::ColourIds::textColourOnId : TextButton::ColourIds::textColourOffId;
+            Colour textColour = btn.findColour(colourId);
+
+            if (!btn.isEnabled())
+                textColour = findColour(LumatoneEditorColourIDs::InactiveText);
+
+            else if (shouldDrawButtonAsHighlighted)
+                textColour = textColour.brighter();
+            
             Font font = getTextButtonFont(btn, btn.getHeight() * GLOBALFONTSCALAR);
+            int margin = font.getStringWidth("  ");
+            int textWidth = font.getStringWidth(btn.getButtonText());
+            
+            auto iconCode = (int)btn.getProperties()[LumatoneEditorStyleIDs::textButtonIconHashCode];
 
-            Image icon = ImageCache::getFromHashCode(properties[LumatoneEditorStyleIDs::textButtonIconHashCode]);
-            int iconH = font.getHeight();
-            int iconW = roundToInt(iconH * ((double)icon.getWidth() / icon.getHeight()));
+            int iconH = font.getHeight();// *0.9f;
+            int iconW = iconH;
             int iconY = roundToInt((btn.getHeight() - iconH) * 0.5f);
 
+            if (iconCode == LumatoneEditorIcon::LoadIcon)
             {
-                ImageProcessor ip;
-                icon = ip.resizeImage(icon, iconW, iconH);
+                iconW *= 1.125f;
+                iconH *= 1.125f;
             }
 
-            int margin = font.getStringWidth("  ");
-            int textWidth = font.getStringWidth(btn.getButtonText());
-            int lineStart = roundToInt((btn.getWidth() - textWidth - margin - iconW) * 0.5f);
-            int secondHalf = lineStart + margin;
-
-            int colourId = shouldDrawButtonAsDown ? TextButton::ColourIds::textColourOnId : TextButton::ColourIds::textColourOffId;
-            Colour textColour = btn.findColour(colourId);
-            
-            if (!btn.isEnabled())
-                textColour = findColour(LumatoneEditorColourIDs::InactiveText);
+            if (iconW < 1) iconW = 1;
+            if (iconH < 1) iconH = 1;
 
-            else if (shouldDrawButtonAsHighlighted)
-                textColour = textColour.brighter();
+            // Set up positions of icon and text
+            int lineStart = roundToInt((btn.getWidth() - textWidth - margin - iconW) * 0.5f);
 
-            g.setColour(textColour);
-            g.setFont(font);
+            int iconX = 0;
+            Rectangle<int> textBounds;
 
             bool iconOnRight = (bool)properties[LumatoneEditorStyleIDs::textButtonIconPlacement];
             if (iconOnRight)
             {
-                secondHalf += textWidth;
-                g.drawImageAt(icon, secondHalf, iconY);
-                g.drawFittedText(btn.getButtonText(), btn.getLocalBounds().withLeft(lineStart).withRight(secondHalf), Justification::left, 1);
+                iconX = lineStart + textWidth + margin;
+                textBounds = btn.getLocalBounds().withLeft(lineStart).withRight(iconX - margin);
             }
             else
             {
-                secondHalf += iconW;
-                g.drawImageAt(icon, lineStart, iconY);
-                g.drawFittedText(btn.getButtonText(), btn.getLocalBounds().withTrimmedLeft(secondHalf), Justification::left, 1);
+                iconX = lineStart;
+                textBounds = btn.getLocalBounds().withLeft(iconX + iconW + margin);
+            }
+
+            // Needs special case for "transparent" arrow
+            if (iconCode == LumatoneEditorIcon::LoadIcon)
+            {
+                // Make a tad bit bigger 
+                auto boundsAdj = Rectangle<float>(iconX, iconY, iconW, iconH);
+                boundsAdj.expand(iconW * 0.1f, iconH * 0.1f);
+                drawFolderIconAt(g, boundsAdj.getX(), boundsAdj.getY(), boundsAdj.getWidth(), boundsAdj.getHeight(), textColour, btn.findColour(bkgdColourId));
             }
+            else
+            {
+                Path iconPath;
+                PathStrokeType stroke(1.5f);
+                stroke.setEndStyle(PathStrokeType::EndCapStyle::rounded);
+                stroke.setJointStyle(PathStrokeType::JointStyle::curved);
+
+                switch (LumatoneEditorIcon(iconCode))
+                {
+                // Using X for now
+                //case LumatoneEditorIcon::Checkmark:
+                //    iconPath = Path(tickBoxPath);
+                //    break;
+                case LumatoneEditorIcon::ArrowUp:
+                {
+                    iconPath = arrowUpIconPath;
+                    break;
+                }
+                case LumatoneEditorIcon::ArrowDown:
+                {
+                    iconPath = arrowDownIconPath;
+                    break;
+                }
+                case LumatoneEditorIcon::SaveIcon:
+                {
+                    iconPath = saveIconPath;
+                    break;
+                }
+                default:
+                    break;
+                }
+
+                auto transform = AffineTransform::scale(iconW, iconH).followedBy(AffineTransform::translation(iconX, iconY));
+                iconPath.applyTransform(transform);
+                g.setColour(textColour);
+                g.strokePath(iconPath, stroke);
+            }
+
+            g.setColour(textColour);
+            g.setFont(font);
+            g.drawFittedText(btn.getButtonText(), textBounds, Justification::left, 1);
         }
         else
         {
@@ -335,8 +390,6 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
             drawButtonBackground(g, btn, btn.findColour(bkgdColourId), shouldDrawButtonAsHighlighted, shouldDrawButtonAsDown);
 
             Font font = getTextButtonFont(btn, btn.getHeight());
-//            int margin = font.getStringWidth("  ");
-//            int textWidth = font.getStringWidth(btn.getButtonText());
             int colourId = (btn.getToggleState()) ? TextButton::ColourIds::textColourOnId : TextButton::ColourIds::textColourOffId;
             
             Colour textColour = btn.findColour(colourId);
@@ -777,20 +830,27 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
     //
     //==================================================================
 
-    void drawPopupMenuBackgroundWithOptions(Graphics& g, int width, int height, const PopupMenu::Options& options) override
+
+	void drawPopupMenuBackgroundWithOptions(Graphics& g, int width, int height, const PopupMenu::Options& options) override
     {
         auto target = options.getTargetComponent();
-
-        float margin = target->getHeight() * comboBoxRoundedCornerScalar;
-
-        auto box = dynamic_cast<ComboBox*>(target);
-        if (box)
-            g.setColour(box->findColour(ComboBox::ColourIds::backgroundColourId).withMultipliedSaturation(1.5f)); // Box colour will always be highlighted
-        else
-            g.setColour(findColour(LumatoneEditorColourIDs::ControlBoxHighlighted)); 
-
-        Path menuShape = getConnectedRoundedRectPath(Rectangle<float>(0, 0, target->getWidth(), height), margin, Button::ConnectedEdgeFlags::ConnectedOnTop);
-        g.fillPath(menuShape);
+		if (target)
+		{
+			float margin = target->getHeight() * comboBoxRoundedCornerScalar;
+            
+            if (target->getProperties().contains(LumatoneEditorStyleIDs::popupMenuBackgroundColour))
+                g.setColour(Colour::fromString(target->getProperties()[LumatoneEditorStyleIDs::popupMenuBackgroundColour].toString()).withMultipliedSaturation(1.5f)); // Box colour will always be highlighted
+            else
+                g.setColour(findColour(LumatoneEditorColourIDs::MenuBarBackground));
+			
+            if (target->getProperties()[LumatoneEditorStyleIDs::popupMenuTargetWidth])
+                width = target->getWidth();
+
+			Path menuShape = getConnectedRoundedRectPath(Rectangle<float>(0, 0, width, height), margin, Button::ConnectedEdgeFlags::ConnectedOnTop);
+			g.fillPath(menuShape);
+		}
+		else
+			getDefaultLookAndFeel().drawPopupMenuBackgroundWithOptions(g, width, height, options);
     }
 
     void drawPopupMenuItemWithOptions(
@@ -824,7 +884,7 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         font.setHeight(font.getHeight() * GLOBALFONTSCALAR);
 
         // If it's the last item, reduce size so highlight doesn't pass rounded corners
-        if (item.itemID == target->getItemId(target->getNumItems() - 1))
+        if (target != nullptr && item.itemID == target->getItemId(target->getNumItems() - 1))
         {
             areaToUse = areaToUse.withTrimmedBottom(roundToInt(margin * 0.5f) + 1);
         }
@@ -846,17 +906,23 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
     {
         auto target = dynamic_cast<ComboBox*>(options.getTargetComponent());
 
-        idealWidth = target->getWidth();
-
-        // If the option is the last available option, add a margin
-        if (target->getItemText(target->getNumItems() - 1) == text)
-        {
-            idealHeight = roundToInt(target->getHeight() * (1 + comboBoxRoundedCornerScalar * 0.5f));
-        }
-        else
-        {
-            idealHeight = target->getHeight();
-        }
+		if (target != nullptr)
+		{
+			idealWidth = target->getWidth();
+
+			// If the option is the last available option, add a margin
+			if (target->getItemText(target->getNumItems() - 1) == text)
+			{
+				idealHeight = roundToInt(target->getHeight() * (1 + comboBoxRoundedCornerScalar * 0.5f));
+			}
+			else
+			{
+				idealHeight = target->getHeight();
+			}
+		}
+		else
+		  getDefaultLookAndFeel().getIdealPopupMenuItemSizeWithOptions(text, isSeparator, standardMenuItemHeight, idealWidth, idealHeight,
+			  options);
     }
 
     Font getPopupMenuFont() override
@@ -873,6 +939,34 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
     {
         window.setOpaque(false);
     }
+	
+    //==================================================================
+    //
+    // MENUBAR METHODS
+    //
+    //==================================================================
+
+    void drawMenuBarBackground(Graphics& g, int w, int h, bool isMouseOverBar, MenuBarComponent& menuBar) override
+    {
+        g.setColour(findColour(LumatoneEditorColourIDs::MenuBarBackground));
+        g.fillRect(0, 0, w, h);
+    }
+
+    void drawMenuBarItem(Graphics& g, int w, int h, int index, const String& itemText, 
+        bool isMouseOver, bool isMenuOpen, bool isMouseOverBar, MenuBarComponent& menuBar) override
+    {
+        if (isMouseOver)
+        {
+            Colour bkgdColour = findColour(LumatoneEditorColourIDs::MenuBarBackground).brighter(0.2f);
+            g.setColour(bkgdColour);
+            g.fillRect(0, 0, w, h);
+        }
+
+        g.setColour(findColour(LumatoneEditorColourIDs::ActiveText));
+        g.setFont(getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+        g.drawFittedText(itemText, 0, 0, w, h, Justification::centred, 1);
+
+    }
 
     //==================================================================
     //
@@ -971,6 +1065,83 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         return box.getHeight() * 0.0303f;
     }
 
+    //==================================================================
+    //
+    // ALERTWINDOW METHODS
+    //
+    //==================================================================
+
+    //virtual AlertWindow* createAlertWindow(const String& title, const String& msg, const String& btn1, const String& btn2, const String& btn3, AlertWindow::AlertIconType type, int numButtons, Component* associatedComponent) override
+    //{
+    //    auto window = new AlertWindow(title, msg, type, associatedComponent);
+    //    window->setSize(480, 240);
+
+    //    if (numButtons > 0)
+    //    {
+    //        int w = window->getWidth();
+    //        int h = window->getHeight();
+
+    //        float btnW = w / 7.0f;
+    //        float allMargin = w - btnW * numButtons;
+    //        float eachmargin = allMargin / (numButtons + 1);
+    //        
+    //        float btnH = h / 6.0f;
+    //        
+    //        auto firstButton = new TextButton(title + btn1);
+    //        firstButton->setButtonText(btn1);
+    //        firstButton->setBounds(roundToInt(eachmargin), h - 32, window->getWidth() / window->getWidth() / 7.0, 24);
+    //        window->addAndMakeVisible(*firstButton);
+    //    }
+    //    
+    //    window->setOpaque(true);
+
+    //    return window;
+    //}
+
+    virtual void drawAlertBox(Graphics& g, AlertWindow& window, const Rectangle<int> &textArea, TextLayout& layout) override
+    {
+        g.setColour(findColour(AlertWindow::ColourIds::backgroundColourId));
+        //g.fillRoundedRectangle(window.getLocalBounds().toFloat(), 15);
+        g.fillAll();
+
+        g.setColour(findColour(AlertWindow::ColourIds::outlineColourId));
+        g.drawRect(window.getLocalBounds(), 2);
+
+        g.setColour(findColour(AlertWindow::ColourIds::textColourId));
+        float widthRatio = 0.05f;
+        float heightRatio = 0.15f;
+        
+        layout.draw(g, 
+            textArea.constrainedWithin(
+                window.getLocalBounds().reduced(window.getWidth() * widthRatio, window.getHeight() * heightRatio)
+            ).toFloat());
+    }
+
+    //virtual Array<int> getWidthsForTextButtons(AlertWindow& window, const Array<TextButton*>& btns) override
+    //{
+    //    return getDefaultLookAndFeel().getWidthsForTextButtons(window, btns);
+    //}
+
+    //virtual int getAlertWindowButtonHeight() override
+    //{
+    //    return 16;
+    //}
+
+    virtual Font getAlertWindowTitleFont() override
+    {
+        return getAppFont(LumatoneEditorFont::UniviaProBold).withHeight(18);
+    }
+
+    virtual Font getAlertWindowMessageFont()  override
+    {
+        return getAppFont(LumatoneEditorFont::GothamNarrowMedium).withHeight(16);
+    }
+
+    virtual Font getAlertWindowFont()  override
+    {
+        return getAppFont(LumatoneEditorFont::GothamNarrowMedium).withHeight(14);
+    }
+
 public:
     //==============================================================================================
     // Component Setup functions
@@ -987,41 +1158,19 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         btn.setToggleState(initalToggledState, dontSendNotification);
     }
 
-    void setupTextButton(Button& btn)
-    {
-        btn.setColour(TextButton::ColourIds::buttonOnColourId, Colour(0xff383b3d));
-
-        if (btn.getClickingTogglesState())
-        {
-            btn.setColour(TextButton::ColourIds::buttonColourId, Colour(0xff1c1c1c));
-            btn.setColour(TextButton::ColourIds::textColourOffId, Colour(0xff808080));
-            btn.setColour(TextButton::ColourIds::textColourOnId, Colours::white);
-        }
-        else
-        {
-            btn.setColour(TextButton::ColourIds::buttonColourId, Colour(0xff383b3d));
-        }
-    }
-
     // Set colours of Image button based on Live and Offline Editor Buttons
     // Use the same image for Normal, Highlighted, and Down, but apply alpha layer on Highlighted
-    void setupImageButton(ImageButton& btn, Image btnImage)
-    {
-        btn.setColour(TextButton::ColourIds::buttonColourId, Colour(0xff1c1c1c));
-        btn.setColour(TextButton::ColourIds::buttonOnColourId, Colour(0xff383b3d));
-
-        btn.setImages(false, true, true,
-            btnImage, 1.0f, Colour(),
-            btnImage, 1.0f, Colours::white.withAlpha(0.1f),
-            btnImage, 1.0f, Colour()
-        );
-    }
-
-    // Set text colour to be light gray
-    void setupToggleButton(ToggleButton& btn)
-    {
-        btn.setColour(ToggleButton::ColourIds::textColourId, findColour(LumatoneEditorColourIDs::DescriptionText));
-    }
+    //void setupImageButton(ImageButton& btn, Image btnImage)
+    //{
+    //    btn.setColour(TextButton::ColourIds::buttonColourId, Colour(0xff1c1c1c));
+    //    btn.setColour(TextButton::ColourIds::buttonOnColourId, Colour(0xff383b3d));
+
+    //    btn.setImages(false, true, true,
+    //        btnImage, 1.0f, Colour(),
+    //        btnImage, 1.0f, Colours::white.withAlpha(0.1f),
+    //        btnImage, 1.0f, Colour()
+    //    );
+    //}
 
     // Set Slider style to Rotary
     void setupRotarySlider(Slider& sld)
@@ -1029,21 +1178,9 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         sld.setSliderStyle(Slider::SliderStyle::RotaryHorizontalVerticalDrag);
     }
 
-    // Set generic ComboBox colours
-    void setupComboBox(ComboBox& box)
-    {
-        box.setColour(ComboBox::ColourIds::backgroundColourId, findColour(LumatoneEditorColourIDs::ControlBoxBackground));
-        box.setColour(ComboBox::ColourIds::textColourId,       findColour(LumatoneEditorColourIDs::DescriptionText));
-    }
-
     // Set generic TextEditor colours
     void setupTextEditor(TextEditor& editor)
     {
-        editor.setColour(TextEditor::ColourIds::backgroundColourId,      findColour(LumatoneEditorColourIDs::ControlBoxBackground));
-        editor.setColour(TextEditor::ColourIds::textColourId,            findColour(LumatoneEditorColourIDs::DescriptionText));
-        editor.setColour(TextEditor::ColourIds::highlightColourId,       findColour(LumatoneEditorColourIDs::ControlBoxHighlighted));
-        editor.setColour(TextEditor::ColourIds::highlightedTextColourId, findColour(LumatoneEditorColourIDs::DescriptionText));
-        editor.setColour(TextEditor::ColourIds::shadowColourId,          Colour());
         editor.setIndents(4, 0);
     }
 
@@ -1065,21 +1202,29 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
     /// </summary>
     void cacheImages()
     {
-        ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::ImportIcon4x_png,   BinaryData::ImportIcon4x_pngSize),   LumatoneEditorAssets::ImportIcon);
-        ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::SaveIcon4x_png,     BinaryData::SaveIcon4x_pngSize),     LumatoneEditorAssets::SaveIcon);
-        ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::LoadIcon4x_png,     BinaryData::LoadIcon4x_pngSize),     LumatoneEditorAssets::LoadIcon);
+        //ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::ImportIcon4x_png,   BinaryData::ImportIcon4x_pngSize),   LumatoneEditorAssets::ImportIcon);
+        //ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::SaveIcon4x_png,     BinaryData::SaveIcon4x_pngSize),     LumatoneEditorAssets::SaveIcon);
+        //ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::LoadIcon4x_png,     BinaryData::LoadIcon4x_pngSize),     LumatoneEditorAssets::LoadIcon);
         ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::KeyboardBase_png,   BinaryData::KeyboardBase_pngSize),   LumatoneEditorAssets::LumatoneGraphic);
         ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::KeybedShadows_png,  BinaryData::KeybedShadows_pngSize),  LumatoneEditorAssets::KeybedShadows);
         ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::KeyShape2x_png,     BinaryData::KeyShape2x_pngSize),     LumatoneEditorAssets::KeyShape);
         ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::KeyShadow2x_png,    BinaryData::KeyShadow2x_pngSize),    LumatoneEditorAssets::KeyShadow);
         ImageCache::addImageToCache(ImageCache::getFromMemory(BinaryData::TrashCanIcon2x_png, BinaryData::TrashCanIcon2x_pngSize), LumatoneEditorAssets::TrashCanIcon);
     }
+    
+    void cacheIcons()
+    {
+        saveIconPath = getSaveIconPath();
+        arrowUpIconPath = getArrowPath(Point<float>(0.5f, 0.96f), Point<float>(0.5f, 0.08f), 0.55, 0.333f);
+        arrowDownIconPath = getArrowPath(Point<float>(0.5f, 0.08f), Point<float>(0.5f, 0.96f), 0.55, 0.667f);
+    }
 
     /// <summary>
     /// Sets the LookAndFeel colour palette to default colours
     /// </summary>
     void setupDefaultColours()
     {
+        // Colour references
         setColour(LumatoneEditorColourIDs::LabelPink,                       Colour(0xffdfceca));
         setColour(LumatoneEditorColourIDs::LabelBlue,                       Colour(0xff60aac5));
         setColour(LumatoneEditorColourIDs::DisconnectedRed,                 Colour(0xffd7002a));
@@ -1102,6 +1247,28 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
         setColour(LumatoneEditorColourIDs::RotaryGradientMin,               Colour(0xff5497b6));
         setColour(LumatoneEditorColourIDs::RotaryGradientMax,               Colour(0xff77a8b3));
         setColour(LumatoneEditorColourIDs::DisabledOverlay,                 Colour(0x601b1b1b));
+        setColour(LumatoneEditorColourIDs::MenuBarBackground,               Colour(0xff1a1b1c));
+
+        // Component defaults
+        setColour(TextButton::ColourIds::buttonOnColourId, Colour(0xff383b3d));
+        setColour(TextButton::ColourIds::buttonColourId, Colour(0xff383b3d));
+        setColour(TextButton::ColourIds::textColourOnId, Colours::white);
+        setColour(TextButton::ColourIds::textColourOffId, Colours::white);
+        
+        setColour(ToggleButton::ColourIds::textColourId, findColour(LumatoneEditorColourIDs::DescriptionText));
+
+        setColour(ComboBox::ColourIds::backgroundColourId, findColour(LumatoneEditorColourIDs::ControlBoxBackground));
+        setColour(ComboBox::ColourIds::textColourId, findColour(LumatoneEditorColourIDs::DescriptionText));
+
+        setColour(TextEditor::ColourIds::backgroundColourId, findColour(LumatoneEditorColourIDs::ControlBoxBackground));
+        setColour(TextEditor::ColourIds::textColourId, findColour(LumatoneEditorColourIDs::DescriptionText));
+        setColour(TextEditor::ColourIds::highlightColourId, findColour(LumatoneEditorColourIDs::ControlBoxHighlighted));
+        setColour(TextEditor::ColourIds::highlightedTextColourId, findColour(LumatoneEditorColourIDs::DescriptionText));
+        setColour(TextEditor::ColourIds::shadowColourId, Colour());
+
+        setColour(AlertWindow::ColourIds::backgroundColourId, findColour(LumatoneEditorColourIDs::DarkBackground));
+        setColour(AlertWindow::ColourIds::textColourId, findColour(LumatoneEditorColourIDs::DescriptionText));
+        setColour(AlertWindow::ColourIds::outlineColourId, findColour(LumatoneEditorColourIDs::MediumBackground));
     }
 
 public:
@@ -1111,6 +1278,11 @@ class LumatoneEditorLookAndFeel : public LookAndFeel_V4
 
     LumatoneEditorFonts::Library appFonts;
     
+    Path saveIconPath;
+    Path arrowUpIconPath;
+    Path arrowDownIconPath;
+//    Path ccPolarityDefaultIconPath;
+//    Path ccPolarityInvertedIconPath;
 
     // Default graphics constants
     const float buttonRoundedCornerScalar = 0.2f;
diff --git a/Source/LumatoneEditorStyleCommon.h b/Source/LumatoneEditorStyleCommon.h
index 7ddc5919..8f722e5e 100644
--- a/Source/LumatoneEditorStyleCommon.h
+++ b/Source/LumatoneEditorStyleCommon.h
@@ -43,7 +43,7 @@
     #define CONTROLBOXFONTHEIGHTSCALAR 0.66f
 #elif JUCE_WINDOWS
     #define GLOBALFONTSCALAR 1.0f
-    #define CONTROLBOXFONTHEIGHTSCALAR 0.75f
+    #define CONTROLBOXFONTHEIGHTSCALAR 0.8f
 #elif JUCE_LINUX
     #define GLOBALFONTSCALAR 1.0f
     #define CONTROLBOXFONTHEIGHTSCALAR 0.73f
@@ -414,12 +414,151 @@ static Path createLogomark()
     return logo;
 }
 
+static Path getArrowPath(Point<float> start, Point<float> headPoint, float headWidth, float headHeight)
+{
+    headWidth *= 0.5f;
+    auto left = Point<float>(start.x - headWidth, headHeight);
+    auto right = Point<float>(start.x + headWidth, headHeight);
+
+    Path path;
+
+    path.startNewSubPath(start);
+    path.lineTo(headPoint);
+    path.closeSubPath();
+    path.startNewSubPath(headPoint);
+    path.lineTo(left);
+    path.closeSubPath();
+    path.startNewSubPath(headPoint);
+    path.lineTo(right);
+    path.closeSubPath();
+
+    return path;
+}
+
+static juce::Path getFolderIcon(float folderHeight, float tabBaseX, float tabBaseY)
+{
+    juce::Path path;
+
+    float tabBaseSlopeX = tabBaseX - 0.1f;
+    float folderTop = 1.0f - folderHeight;
+
+    auto v0 = Point<float>(0.0f, folderTop);
+    auto v1 = Point<float>(0.0f, folderHeight);
+    auto v2 = Point<float>(1.0f, folderHeight);
+    auto v3 = Point<float>(1.0f, tabBaseY);
+    auto v4 = Point<float>(tabBaseX, tabBaseY);
+    auto v5 = Point<float>(tabBaseSlopeX, folderTop);
+
+    path.startNewSubPath(v0);
+    path.lineTo(v1);
+    path.lineTo(v2);
+    path.lineTo(v3);
+    path.lineTo(v4);
+    path.lineTo(v5);
+    path.closeSubPath();
+
+    return path;
+}
+
+
+static void drawFolderIconAt(Graphics& g, int x, int y, int width, int height, Colour folderColour, Colour arrowColour)
+{
+    float folderHeight = 1.0f;
+    Path folder = getFolderIcon(0.91f, 0.5f, 0.22f).createPathWithRoundedCorners(0.05f);
+
+    auto transform = AffineTransform::scale(width, height).followedBy(AffineTransform::translation(x, y));
+    folder.applyTransform(transform);
+
+    g.setColour(folderColour);
+    g.fillPath(folder);
+
+    Path arrowPath = getArrowPath(Point<float>(0.5f, folderHeight - 0.267f), Point<float>(0.5f, 0.35f), 0.2f, 0.46f);
+    arrowPath.applyTransform(transform);
+
+    PathStrokeType stroke(1.25f);
+    stroke.setEndStyle(PathStrokeType::EndCapStyle::rounded);
+    stroke.setJointStyle(PathStrokeType::JointStyle::curved);
+    
+    g.setColour(arrowColour);
+    g.strokePath(arrowPath, stroke);
+}
+
+static Path getSaveIconPath()
+{
+    float boxHeight = 0.6f;
+    float boxWidth = 1.0f;
+    boxWidth *= 0.5f;
+
+    float boxLeft = 0.5f - boxWidth;
+    float boxRight = 0.5f + boxWidth;
+
+    // Box
+    auto v0 = juce::Point<float>(boxLeft, boxHeight);
+    auto v1 = juce::Point<float>(boxLeft, 1.0f);
+    auto v2 = juce::Point<float>(boxRight, 1.0f);
+    auto v3 = juce::Point<float>(boxRight, boxHeight);
+
+    juce::Path path;
+    path.startNewSubPath(v0);
+    path.lineTo(v1);
+    path.closeSubPath();
+    path.startNewSubPath(v1);
+    path.lineTo(v2);
+    path.closeSubPath();
+    path.startNewSubPath(v2);
+    path.lineTo(v3);
+    path.closeSubPath();
+
+    Path rounded = path.createPathWithRoundedCorners(0.01f);
+
+    Path arrow = getArrowPath(Point<float>(0.5f, 0.0f), Point<float>(0.5f, 0.667f), 0.4f, 0.5f);
+    rounded.addPath(arrow);
+
+    return rounded;
+}
+
+static void getCCPolarityIconPath(bool inverted, Path& arrowPath, Path& faderPath)
+{
+    float glyphWidth = 0.25f;
+    
+    float y1 = 0.8f;
+    float y2 = 1.0f - y1;
+    
+    float arrowX = 0.3f;
+    float arrowHeadDif = abs(y1 - y2) * 0.333;
+    
+    float faderMax = 0.81f;
+    float faderEdge = faderMax - glyphWidth;
+    
+    if (inverted)
+    {
+        arrowPath = getArrowPath(Point<float>(arrowX, y1), Point<float>(arrowX, y2), glyphWidth, y2 + arrowHeadDif);
+        
+        faderPath.startNewSubPath(faderEdge, y1);
+        faderPath.lineTo(faderEdge, y2);
+        faderPath.lineTo(faderMax, y2);
+        faderPath.closeSubPath();
+    }
+    else
+    {
+        arrowPath = getArrowPath(Point<float>(arrowX, y2), Point<float>(arrowX, y1), glyphWidth, y1 - arrowHeadDif);
+        
+        faderPath.startNewSubPath(faderEdge, y1);
+        faderPath.lineTo(faderMax, y1);
+        faderPath.lineTo(faderEdge, y2);
+        faderPath.closeSubPath();
+    }
+}
+
+//static void drawSaveIconAt(Graphics& g, int x, int y)
+
+
 // Hash codes for use with ImageCache::getFromHashCode()
 enum LumatoneEditorAssets
 {
-    LoadIcon            = 0x0002000,
-    SaveIcon            = 0x0002001,
-    ImportIcon          = 0x0002002,
+    //LoadIcon            = 0x0002000,
+    //SaveIcon            = 0x0002001,
+    //ImportIcon          = 0x0002002,
     LumatoneGraphic     = 0x0002100,
     KeybedShadows       = 0x0002101,
     KeyShape            = 0x0002200,
@@ -430,6 +569,16 @@ enum LumatoneEditorAssets
     TrashCanIcon        = 0x0005002
 };
 
+enum LumatoneEditorIcon
+{
+    Checkmark   = 0x01,
+    ArrowUp,
+    ArrowDown,
+    SaveIcon,
+    LoadIcon,
+    CCPolarityIcon
+};
+
 enum LumatoneEditorColourIDs
 {
     LabelPink,
@@ -453,20 +602,10 @@ enum LumatoneEditorColourIDs
     CurveGridColour,
     RotaryGradientMin,
     RotaryGradientMax,
-    DisabledOverlay
+    DisabledOverlay,
+    MenuBarBackground
 };
 
-// Static functions for getting default Lumatone Editor fonts
-//struct LumatoneEditorFonts
-//{
-//    static Font UniviaPro                (float height = 12.0f)  { return Font("Univia Pro",       height, Font::plain);                                          }  
-//    static Font UniviaProBold            (float height = 12.0f)  { return Font("Univia Pro",       height, Font::bold );                                          }
-//    static Font FranklinGothic           (float height = 12.0f)  { return Font("Franklin Gothic",  height, Font::plain).withTypefaceStyle("Medium");              }
-//    static Font GothamNarrowMedium       (float height = 12.0f)  { return Font("Gotham",           height, Font::plain).withTypefaceStyle("Narrow Medium");       }
-//    static Font GothamNarrowMediumBold   (float height = 12.0f)  { return       GothamNarrowMedium, height)             .withTypefaceStyle("Narrow Bold");         }
-//    static Font GothamNarrowMediumItalic (float height = 12.0f)  { return       GothamNarrowMedium, height)             .withTypefaceStyle("Narrow Light Italic"); }
-//};
-
 namespace LumatoneEditorStyleIDs
 {    
     // Index of LumatoneEditorFontCollection
@@ -484,7 +623,7 @@ namespace LumatoneEditorStyleIDs
 
     static Identifier tabbedButtonBarDepthScalar = Identifier("TabbedButtonBarDepthScalar");
 
-    // The Image::Cache hash code for an icon that should be displayed on a TextButton
+    // The LumatoneEditorIcon hash code for an icon that should be displayed on a TextButton
     static Identifier textButtonIconHashCode = Identifier("TextButtonIconHashCode");
 
     // Choose where to put the icon on a TextButton
@@ -499,10 +638,15 @@ namespace LumatoneEditorStyleIDs
     static Identifier textButtonHyperlinkFlag = Identifier("TextButtonHyperlinkFlag");
 
     static Identifier popupMenuMaxColumns = Identifier("PopupMenuMaxColumns");
+    // Uses the width of the target component of a menu instead of parameters
+    static Identifier popupMenuTargetWidth = Identifier("PopupMenuTargetWidth");
+
+    static Identifier popupMenuBackgroundColour = Identifier("PopupMenuBackgroundColour");
 
     static Identifier connectedEdgeFlags = Identifier("ConnectedEdgesFlags");
 
     // Odd values will have top right and bottom left rounded corners
     // Even values will have top left and bottom right rounded corners
     static Identifier roundedDiagonalCorners = Identifier("RoundedDiagonalCorners");
+
 }
diff --git a/Source/LumatoneFirmwareDefinitions.h b/Source/LumatoneFirmwareDefinitions.h
new file mode 100644
index 00000000..86cfb332
--- /dev/null
+++ b/Source/LumatoneFirmwareDefinitions.h
@@ -0,0 +1,436 @@
+/*
+  ==============================================================================
+
+    LumatoneFirmwareDefinitions.h
+    Created: 17 Apr 2021 10:19:39pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#pragma once
+#include "JuceHeader.h"
+
+/*
+==============================================================================
+System exclusive board definitions
+==============================================================================
+*/
+
+#define BOARD_SERVER 0x0
+#define BOARD_OCT_1  0x1
+#define BOARD_OCT_2  0x2
+#define BOARD_OCT_3  0x3
+#define BOARD_OCT_4  0x4
+#define BOARD_OCT_5  0x5
+
+/*
+==============================================================================
+System exclusive command structure
+==============================================================================
+*/
+
+#define MANUFACTURER_ID_0 0x00
+#define MANUFACTURER_ID_1 0x21
+#define MANUFACTURER_ID_2 0x50
+
+#define MANU_0       0x0
+#define MANU_1       0x1
+#define MANU_2       0x2
+#define BOARD_IND    0x3
+#define CMD_ID       0x4
+#define MSG_STATUS   0x5
+#define CALIB_MODE   0x5
+#define PAYLOAD_INIT 0x6
+
+#define ECHO_FLAG    0x5  // Used to differentiate test responses from MIDI feedback
+#define TEST_ECHO    0x7F // Should not be returned by Lumatone firmware
+
+#define SERIAL_55_KEYS "00 00 00 00 00 00"
+
+/*
+==============================================================================
+System exclusive command bytes
+==============================================================================
+*/
+
+// Start support at 55-keys firmware version, Developmental versions
+#define CHANGE_KEY_NOTE 0x00
+#define SET_KEY_COLOUR 0x01
+
+#define SAVE_PROGRAM 0x02
+
+#define SET_FOOT_CONTROLLER_SENSITIVITY 0x03
+#define INVERT_FOOT_CONTROLLER 0x04
+
+#define MACROBUTTON_COLOUR_ON 0x05
+#define MACROBUTTON_COLOUR_OFF 0x06
+
+#define SET_LIGHT_ON_KEYSTROKES 0x07
+
+#define SET_VELOCITY_CONFIG 0x08
+#define SAVE_VELOCITY_CONFIG 0x09
+#define RESET_VELOCITY_CONFIG 0x0A
+
+#define SET_FADER_CONFIG 0x0B
+#define SAVE_FADER_CONFIG 0x0C
+#define RESET_FADER_CONFIG 0x0D
+
+#define SET_AFTERTOUCH_FLAG 0x0E
+#define CALIBRATE_AFTERTOUCH 0x0F
+#define SET_AFTERTOUCH_CONFIG 0x10
+#define SAVE_AFTERTOUCH_CONFIG 0x11
+#define RESET_AFTERTOUCH_CONFIG 0x12
+
+#define GET_RED_LED_CONFIG 0x13
+#define GET_GREEN_LED_CONFIG 0x14
+#define GET_BLUE_LED_CONFIG 0x15
+#define GET_CHANNEL_CONFIG 0x16
+#define GET_NOTE_CONFIG 0x17
+#define GET_KEYTYPE_CONFIG 0x18
+
+#define GET_MAX_THRESHOLD 0x19
+#define GET_MIN_THRESHOLD 0x1A
+#define GET_AFTERTOUCH_MAX 0x1B
+#define GET_KEY_VALIDITY 0x1C
+
+#define GET_VELOCITY_CONFIG 0x1D
+#define GET_FADER_CONFIG 0x1E
+#define GET_AFTERTOUCH_CONFIG 0x1F
+
+// Firmware Version 1.0.3
+#define SET_VELOCITY_INTERVALS 0x20
+#define GET_VELOCITY_INTERVALS 0x21
+
+// Firmware Version 1.0.4
+#define GET_FADER_TYPE_CONFIGURATION 0x22
+
+// Start 56-keys, Firmware Version 1.0.5
+#define GET_SERIAL_IDENTITY 0x23
+// 0x23 will acknowledge in 55-keys but will not return serial number
+
+#define CALIBRATE_KEYS 0x24
+
+#define DEMO_MODE 0x25
+
+// Firmware Version 1.0.6
+#define CALIBRATE_PITCH_MOD_WHEEL 0x26
+#define SET_MOD_WHEEL_SENSITIVITY 0x27
+#define SET_PITCH_WHEEL_SENSITIVITY 0x28
+
+// Firmware Version 1.0.7, Start shipping backers and batches
+#define SET_KEY_MAX_THRESHOLD 0x29
+#define SET_KEY_MIN_THRESHOLD 0x2A
+#define SET_KEY_FADER_SENSITIVITY 0x2B
+#define SET_KEY_AFTERTOUCH_SENSITIVITY 0x2C
+
+#define SET_LUMATOUCH_CONFIG 0x2D
+#define SAVE_LUMATOUCH_CONFIG 0x2E
+#define RESET_LUMATOUCH_CONFIG 0x2F
+#define GET_LUMATOUCH_CONFIG 0x30
+
+// Firmware Version 1.0.8
+#define GET_FIRMWARE_REVISION 0x31
+
+// Firmware Version 1.0.9
+#define SET_CC_ACTIVE_THRESHOLD 0x32
+#define LUMA_PING 0x33
+
+// Firmware Version 1.0.10
+#define RESET_BOARD_THRESHOLDS 0x34
+#define SET_KEY_SAMPLING 0x35
+
+// Firmware Version 1.0.11
+#define RESET_WHEELS_THRESHOLD 0x36
+#define SET_PITCH_WHEEL_CENTER_THRESHOLD 0x37
+#define CALLIBRATE_EXPRESSION_PEDAL 0x38
+#define RESET_EXPRESSION_PEDAL_BOUNDS 0x39
+
+// Firmware Version 1.0.12
+#define GET_BOARD_THRESHOLD_VALUES 0x3A
+#define GET_BOARD_SENSITIVITY_VALUES 0x3B
+
+// Firmware Version 1.0.13
+#define SET_PERIPHERAL_CHANNELS 0x3C
+#define GET_PERIPHERAL_CHANNELS 0x3D
+#define PERIPHERAL_CALBRATION_DATA 0x3E
+
+// Firmware Version 1.0.14
+#define SET_AFTERTOUCH_TRIGGER_DELAY 0x3F
+#define GET_AFTERTOUCH_TRIGGER_DELAY 0x40
+
+// Firmware Version 1.0.15
+#define SET_LUMATOUCH_NOTE_OFF_DELAY 0x41
+#define GET_LUMATOUCH_NOTE_OFF_DELAY 0x42
+#define SET_EXPRESSION_PEDAL_THRESHOLD 0x43
+#define GET_EXPRESSION_PEDAL_THRESHOLD 0x44
+#define INVERT_SUSTAIN_PEDAL 0x45
+
+typedef enum
+{
+	NACK    = 0x00, // Not recognized
+	ACK     = 0x01, // Acknowledged, OK
+	BUSY    = 0x02, // Controller busy
+	ERROR   = 0x03, // Error
+	STATE   = 0x04, // Not in MIDI state
+} TerpstraMIDIAnswerReturnCode;
+
+typedef enum
+{
+	noteOnNoteOff        = 1,
+	continuousController = 2,
+	lumaTouch            = 3,
+	disabled             = 4
+} LumatoneKeyType;
+
+enum class LumatoneFirmwareVersion
+{
+	NO_VERSION      = 0,  // Used for instantiation
+	VERSION_55_KEYS = 0,  // Used when GetSerialIdentity returns 00000000
+	UNKNOWN_VERSION = 0,  // Used when no other version applies
+	VERSION_1_0_3 = 0x10,
+	VERSION_1_0_4,
+	VERSION_1_0_5,
+	VERSION_1_0_6,
+	VERSION_1_0_7,
+	VERSION_1_0_8,
+	VERSION_1_0_9,
+	VERSION_1_0_10,
+	VERSION_1_0_11,
+	VERSION_1_0_12,
+	VERSION_1_0_13,
+	VERSION_1_0_14,
+	VERSION_1_0_15,
+	LAST_VERSION = VERSION_1_0_15,
+	FUTURE_VERSION = 0xFFFF  // Used when version is nonnegative and below 9.9.999
+} ;
+
+struct FirmwareVersion
+{
+	int major = 0;
+	int minor = 0;
+	int revision = 0;
+
+	FirmwareVersion(int majorVersion, int minorVersion, int revisionNumber)
+		: major(majorVersion), minor(minorVersion), revision(revisionNumber) {}
+
+	bool isValid() { return major > 0 || minor > 0 || revision > 0; }
+
+	String toString() const { return String(major) + "." + String(minor) + "." + String(revision); }
+
+	//============================================================================
+
+	static FirmwareVersion fromString(String firmwareVersion)
+	{
+		FirmwareVersion version(0, 0, 0);
+
+		String afterFirstDecimal = firmwareVersion.fromFirstOccurrenceOf(".", false, true);
+
+		// Just check if it contains at least two decimals
+		if (firmwareVersion.contains(".") && afterFirstDecimal.contains("."))
+		{
+			String majorNum = firmwareVersion.upToFirstOccurrenceOf(".", false, true);
+
+			String minorNum = afterFirstDecimal.upToFirstOccurrenceOf(".", false, true);
+
+			if (minorNum == afterFirstDecimal)
+			{
+				// This means there was only one decimal, don't try to parse
+				return version;
+			}
+
+			String revisionNum = firmwareVersion.fromLastOccurrenceOf(".", false, true);
+			if (revisionNum != revisionNum.upToFirstOccurrenceOf(".", false, true))
+			{
+				// This means there's an additional decimal, don't try to parse
+				return version;
+			}
+
+			version.major = majorNum.getIntValue();
+			version.minor = majorNum.getIntValue();
+			version.revision = majorNum.getIntValue();
+		}
+
+		return version;
+	}
+
+	static FirmwareVersion fromDeterminedVersion(LumatoneFirmwareVersion versionIn)
+	{
+		int versionIndex = (int)versionIn;
+		if (versionIn >= LumatoneFirmwareVersion::VERSION_1_0_3)
+		{
+			// Return special definition for future version
+			if (versionIn > LumatoneFirmwareVersion::LAST_VERSION)
+				return FirmwareVersion(0, 0, (int)LumatoneFirmwareVersion::FUTURE_VERSION);
+			else
+				return FirmwareVersion(1, 0, versionIndex - (int)LumatoneFirmwareVersion::VERSION_1_0_3);
+		}
+		// Return special definition for 55-keys version
+		else if (versionIn == LumatoneFirmwareVersion::VERSION_55_KEYS)
+			return FirmwareVersion(0, 0, 55);
+		
+		return FirmwareVersion(0, 0, 0);
+	}
+};
+
+struct FirmwareSupport
+{
+	enum class Error
+	{
+		noError = 0,
+		noMidiOutputSet,
+		deviceIsBusy,
+		messageTooShort,
+		messageTooLong,
+        messageIsAnEcho,
+		messageHasIncorrectManufacturerId,
+		messageHasInvalidBoardIndex,
+		messageHasInvalidStatusByte,
+		messageIsNotResponseToCommand,
+		messageIsNotSysEx,
+		unknownCommand,
+		externalError
+	};
+
+	String errorToString(Error err)
+	{
+		switch (err)
+		{
+		case Error::noError:
+			return "No error";
+		case Error::noMidiOutputSet:
+			return "No Midi output set";
+		case Error::deviceIsBusy:
+			return "Device is busy";
+		case Error::messageTooShort:
+            return "Message too short";
+		case Error::messageTooLong:
+            return "Message too long";
+        case Error::messageIsAnEcho:
+            return "Message is an echo";
+		case Error::messageHasIncorrectManufacturerId:
+			return "Incorrect manufacturer ID";
+		case Error::messageHasInvalidBoardIndex:
+			return "Invalid board index";
+		case Error::messageHasInvalidStatusByte:
+			return "Message has invalid status byte";
+		case Error::messageIsNotResponseToCommand:
+			return "Message is not a response to the command";
+		case Error::messageIsNotSysEx:
+			return "Message is not a valid SysEx message.";
+		case Error::unknownCommand:
+			return "Unknown command / Not Acknowledged";
+		case Error::externalError:
+			return "Error from device";
+		default:
+			return "Undefined error..";
+		}
+	}
+
+	LumatoneFirmwareVersion getLumatoneFirmwareVersion(FirmwareVersion versionIn)
+	{
+		if (!(versionIn.major | versionIn.minor | versionIn.revision))
+			return LumatoneFirmwareVersion::VERSION_55_KEYS;
+
+		else if ((versionIn.major < 0) | (versionIn.minor < 0) | (versionIn.revision < 0))
+			return LumatoneFirmwareVersion::UNKNOWN_VERSION;
+		
+		else if (versionIn.major == 1)
+		{
+			if (versionIn.minor == 0)
+			{
+				if (versionIn.revision < 3)
+					return LumatoneFirmwareVersion::VERSION_55_KEYS;
+
+				else if (versionIn.revision - 3 > (int)LumatoneFirmwareVersion::LAST_VERSION - (int)LumatoneFirmwareVersion::VERSION_1_0_3)
+					return LumatoneFirmwareVersion::FUTURE_VERSION;
+
+				else if (versionIn.revision >= 3)
+					return (LumatoneFirmwareVersion)((int)LumatoneFirmwareVersion::VERSION_1_0_3 + (versionIn.revision - 3));
+			}
+		}
+
+		else if (versionIn.major < 9 && versionIn.minor < 9 && versionIn.revision < 999)
+			return LumatoneFirmwareVersion::FUTURE_VERSION;
+
+		return LumatoneFirmwareVersion::UNKNOWN_VERSION;
+	}
+
+	// TODO use map instead
+	// Returns the lowest version that will return ACK for a given command
+	LumatoneFirmwareVersion getLowestVersionAcknowledged(unsigned int CMD)
+	{
+		if (CMD < CHANGE_KEY_NOTE) // 0x00
+			LumatoneFirmwareVersion::UNKNOWN_VERSION;
+
+		else if (CMD <= GET_SERIAL_IDENTITY) // 0x23
+			LumatoneFirmwareVersion::NO_VERSION;
+
+		else if (CMD <= DEMO_MODE) // 0x25
+			LumatoneFirmwareVersion::VERSION_1_0_5;
+
+		else if (CMD <= CALIBRATE_PITCH_MOD_WHEEL) // 0x26
+			LumatoneFirmwareVersion::VERSION_1_0_6;
+
+		else if (CMD <= SET_KEY_MAX_THRESHOLD) // 0x29
+			LumatoneFirmwareVersion::VERSION_1_0_7;
+
+		else if (CMD <= GET_FIRMWARE_REVISION) // 0x31
+			LumatoneFirmwareVersion::VERSION_1_0_8;
+
+		else if (CMD <= LUMA_PING) // 0x33
+			return LumatoneFirmwareVersion::VERSION_1_0_9;
+
+		else if (CMD <= SET_KEY_SAMPLING) // 0x35
+			return LumatoneFirmwareVersion::VERSION_1_0_10;
+
+		else if (CMD <= RESET_EXPRESSION_PEDAL_BOUNDS) // 0x39
+			return LumatoneFirmwareVersion::VERSION_1_0_11;
+
+		else if (CMD <= GET_BOARD_SENSITIVITY_VALUES) // 0x3B
+			return LumatoneFirmwareVersion::VERSION_1_0_12;
+
+		else if (CMD <= PERIPHERAL_CALBRATION_DATA) // 0x3E
+			return LumatoneFirmwareVersion::VERSION_1_0_13;
+
+		else if (CMD <= SET_AFTERTOUCH_TRIGGER_DELAY) // 0x3F
+			return LumatoneFirmwareVersion::VERSION_1_0_14;
+
+		else if (CMD <= INVERT_SUSTAIN_PEDAL) //0x45
+			return LumatoneFirmwareVersion::VERSION_1_0_15;
+
+		else
+			return LumatoneFirmwareVersion::FUTURE_VERSION;
+	}
+
+	bool versionAcknowledgesCommand(LumatoneFirmwareVersion VERSION, unsigned int CMD)
+	{
+		return getLowestVersionAcknowledged(CMD) <= VERSION;
+	}
+
+	bool versionAcknowledgesCommand(FirmwareVersion versionIn, unsigned int CMD)
+	{
+		auto VERSION = getLumatoneFirmwareVersion(versionIn);
+		return versionAcknowledgesCommand(VERSION, CMD);
+	}
+
+	// Should always be 56 in production
+	int getOctaveSize(LumatoneFirmwareVersion VERSION)
+	{
+		if (VERSION >= LumatoneFirmwareVersion::VERSION_1_0_3)
+			return 56;
+		else
+			return 55;
+	}
+
+	int getCommandNumber(const MidiMessage& msg)
+	{
+		return msg.getSysExData()[CMD_ID];
+	}
+    
+    String serialIdentityToString(int* serialBytes)
+    {
+        return String::toHexString(serialBytes, 6);
+    }
+
+};
diff --git a/Source/LumatoneMenu.cpp b/Source/LumatoneMenu.cpp
new file mode 100644
index 00000000..655244d6
--- /dev/null
+++ b/Source/LumatoneMenu.cpp
@@ -0,0 +1,85 @@
+/*
+  ==============================================================================
+
+    LumatoneMenu.cpp
+    Created: 25 Apr 2021 12:07:58pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "LumatoneMenu.h"
+#include "Main.h"
+
+namespace Lumatone {
+	namespace Menu {
+
+		MainMenuModel::MainMenuModel(ApplicationCommandManager* commandManager)
+		{
+			theManager = commandManager;
+			setApplicationCommandManagerToWatch(commandManager);
+
+		}
+
+		StringArray MainMenuModel::getMenuBarNames()
+		{
+			const char* const names[] = { "File", "Edit", "Help", nullptr };
+			return StringArray(names);
+		}
+
+		void MainMenuModel::createFileMenu(PopupMenu& menu)
+		{
+			menu.addCommandItem(theManager, openSysExMapping);
+			menu.addCommandItem(theManager, saveSysExMapping);
+			menu.addCommandItem(theManager, saveSysExMappingAs);
+			menu.addCommandItem(theManager, resetSysExMapping);
+
+			menu.addSeparator();
+
+			PopupMenu recentFilesMenu;
+			TerpstraSysExApplication::getApp().getRecentFileList().createPopupMenuItems(recentFilesMenu, recentFilesBaseID, true, true);
+			menu.addSubMenu("Recent Files", recentFilesMenu);
+
+#if ! JUCE_MAC
+			menu.addSeparator();
+			menu.addCommandItem(theManager, StandardApplicationCommandIDs::quit);
+#endif
+		}
+
+		void MainMenuModel::createEditMenu(PopupMenu& menu)
+		{
+			menu.addCommandItem(theManager, deleteOctaveBoard);
+			menu.addCommandItem(theManager, copyOctaveBoard);
+			menu.addCommandItem(theManager, pasteOctaveBoard);
+			menu.addCommandItem(theManager, undo);
+			menu.addCommandItem(theManager, redo);
+		}
+
+		void MainMenuModel::createHelpMenu(PopupMenu& menu)
+		{
+			menu.addCommandItem(theManager, aboutSysEx);
+		}
+
+		PopupMenu MainMenuModel::getMenuForIndex(int topLevelMenuIndex, const String& menuName)
+		{
+			PopupMenu menu;
+
+			if (menuName == "File")             createFileMenu(menu);
+			else if (menuName == "Edit")		createEditMenu(menu);
+			else if (menuName == "Help")		createHelpMenu(menu);
+			else                                jassertfalse; // names have changed?
+
+			return menu;
+		}
+
+		void MainMenuModel::menuItemSelected(int menuItemID, int topLevelMenuIndex)
+		{
+			if (menuItemID >= recentFilesBaseID && menuItemID < recentFilesBaseID + 100)
+			{
+				// open a file from the "recent files" menu
+				TerpstraSysExApplication::getApp().openRecentFile(menuItemID - recentFilesBaseID);
+			}
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/Source/LumatoneMenu.h b/Source/LumatoneMenu.h
index d38557aa..19589155 100644
--- a/Source/LumatoneMenu.h
+++ b/Source/LumatoneMenu.h
@@ -10,13 +10,45 @@
 
 #pragma once
 
+#include "../JuceLibraryCode/JuceHeader.h"
+
+
 namespace Lumatone {
 	namespace Menu {
 		enum commandIDs {
+			openSysExMapping = 0x200010,
+			saveSysExMapping = 0x200011,
+			saveSysExMappingAs = 0x200012,
+			resetSysExMapping = 0x200013,
+
 			deleteOctaveBoard = 0x200017,
 			copyOctaveBoard = 0x200018,
-			pasteOctaveBoard = 0x200019
+			pasteOctaveBoard = 0x200019,
+			undo = 0x200020,
+			redo = 0x200021,
+
+			recentFilesBaseID = 0x200100,
+
+			aboutSysEx = 0x200040
 		};
+
+		class MainMenuModel : public MenuBarModel
+		{
+		public:
+			MainMenuModel(ApplicationCommandManager* commandManager);
+
+			virtual StringArray getMenuBarNames();
+			PopupMenu getMenuForIndex(int topLevelMenuIndex, const String& menuName);
+			void menuItemSelected(int menuItemID, int topLevelMenuIndex);
+
+			virtual void createFileMenu(PopupMenu& menu);
+			virtual void createEditMenu(PopupMenu& menu);
+			virtual void createHelpMenu(PopupMenu& menu);
+
+		private:
+			ApplicationCommandManager * theManager;
+		};
+
 	}
 	namespace Debug {
 		enum commandIDs {
diff --git a/Source/Main.cpp b/Source/Main.cpp
index 58b83548..701fbba1 100644
--- a/Source/Main.cpp
+++ b/Source/Main.cpp
@@ -17,6 +17,12 @@
 
 //==============================================================================
 
+MainContentComponent* TerpstraSysExApplication::getMainContentComponent()
+{
+	jassert(mainWindow != nullptr);
+	return (MainContentComponent*)(mainWindow->getContentComponent());
+}
+
 TerpstraSysExApplication::TerpstraSysExApplication()
 	: lookAndFeel(appFonts.fonts, true), tooltipWindow(), hasChangesToSave(false)
 {
@@ -32,13 +38,6 @@ TerpstraSysExApplication::TerpstraSysExApplication()
 	propertiesFile = new PropertiesFile(options);
 	jassert(propertiesFile != nullptr);
 
-	octaveBoardSize = propertiesFile->getBoolValue("55Keys", false) ? 55 : 56;
-
-	int manufacturerId = propertiesFile->getIntValue("ManufacturerId", 0x002150);
-	midiDriver.setManufacturerId(manufacturerId);
-
-	deviceMonitor.reset(new DeviceActivityMonitor(midiDriver, propertiesFile->getIntValue("DeviceDetectTimeout", 700)));
-
 	// Localisation
 	String localisation = getLocalisation(SystemStats::getDisplayLanguage());
 	LocalisedStrings::setCurrentMappings(new LocalisedStrings(localisation, false));
@@ -52,8 +51,8 @@ TerpstraSysExApplication::TerpstraSysExApplication()
 	// Colour scheme
 	//lookAndFeel.setColourScheme(lookAndFeel.getDarkColourScheme());
 
-	lookAndFeel.setColour(juce::ComboBox::arrowColourId, Colour(0xfff7990d));
-	lookAndFeel.setColour(juce::ToggleButton::tickColourId, Colour(0xfff7990d));
+	//lookAndFeel.setColour(juce::ComboBox::arrowColourId, Colour(0xfff7990d));
+	//lookAndFeel.setColour(juce::ToggleButton::tickColourId, Colour(0xfff7990d));
 
 	lookAndFeel.setColour(TerpstraKeyEdit::backgroundColourId, lookAndFeel.findColour(juce::ResizableWindow::backgroundColourId));
 	lookAndFeel.setColour(TerpstraKeyEdit::outlineColourId, Colour(0xffd7d9da));
@@ -103,6 +102,9 @@ TerpstraSysExApplication::TerpstraSysExApplication()
 
 	reloadColourPalettes();
 
+	lumatoneController.setDeviceDetectionTimeout(propertiesFile->getIntValue("DetectDevicesTimeout", 500));
+	lumatoneController.checkConnectionWhenInactive(propertiesFile->getBoolValue("CheckConnectionIfInactive", true));
+
 	// State of main window will be read from properties file when main window is created
 }
 
@@ -118,23 +120,6 @@ void TerpstraSysExApplication::initialise(const String& commandLine)
 
 		for (auto commandLineParameter : commandLineParameters)
 		{
-			auto paramInLowerCase = commandLineParameter.toLowerCase();
-			if (paramInLowerCase == "-55keys" || paramInLowerCase == "/55keys")
-			{
-				octaveBoardSize = 55;
-				jassert(propertiesFile != nullptr);
-				propertiesFile->setValue("55Keys", true);
-				continue;
-			}
-
-			if (paramInLowerCase == "-56keys" || paramInLowerCase == "/56keys")
-			{
-				octaveBoardSize = 56;
-				jassert(propertiesFile != nullptr);
-				propertiesFile->setValue("55Keys", false);
-				continue;
-			}
-
 			// ToDo switch on/off isomorphic mass assign mode
 
 			// Try to open a config file
@@ -156,11 +141,22 @@ void TerpstraSysExApplication::initialise(const String& commandLine)
 
 	commandManager.reset(new ApplicationCommandManager());
 	commandManager->registerAllCommandsForTarget(this);
-
+    menuModel.reset(new Lumatone::Menu::MainMenuModel(commandManager.get()));
+    
 	mainWindow.reset(new MainWindow());
 	mainWindow->addKeyListener(commandManager->getKeyMappings());
 	mainWindow->restoreStateFromPropertiesFile(propertiesFile);
 
+#if JUCE_MAC
+	MenuBarModel::setMacMainMenu(menuModel.get());
+#else
+	mainWindow->setMenuBar(menuModel.get());
+	mainWindow->getMenuBarComponent()->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour, 
+		lookAndFeel.findColour(LumatoneEditorColourIDs::MenuBarBackground).toString()
+	);
+
+#endif
+
 	if (currentFile.existsAsFile())
 		openFromCurrentFile();
 }
@@ -168,7 +164,7 @@ void TerpstraSysExApplication::initialise(const String& commandLine)
 void TerpstraSysExApplication::shutdown()
 {
     // Add your application's shutdown code here..
-
+    
 	// Save documents directories (Future: provide option to change them and save after changed by user)
 	propertiesFile->setValue("UserDocumentsDirectory", userDocumentsDirectory.getFullPathName());
 	propertiesFile->setValue("UserMappingsDirectory",   userMappingsDirectory.getFullPathName());
@@ -188,9 +184,13 @@ void TerpstraSysExApplication::shutdown()
 
 	LocalisedStrings::setCurrentMappings(nullptr);
 
+#if JUCE_MAC
+    MenuBarModel::setMacMainMenu(nullptr);
+#endif
+    menuModel = nullptr;
+
     mainWindow = nullptr; // (deletes our window)
-	//commandManager = nullptr;
-    deviceMonitor = nullptr;
+//	commandManager = nullptr;
 }
 
 //==============================================================================
@@ -297,10 +297,20 @@ void TerpstraSysExApplication::getAllCommands(Array <CommandID>& commands)
 	JUCEApplication::getAllCommands(commands);
 
 	const CommandID ids[] = {
+		Lumatone::Menu::commandIDs::openSysExMapping,
+		Lumatone::Menu::commandIDs::saveSysExMapping,
+		Lumatone::Menu::commandIDs::saveSysExMappingAs,
+		Lumatone::Menu::commandIDs::resetSysExMapping,
+
 		Lumatone::Menu::commandIDs::deleteOctaveBoard,
 		Lumatone::Menu::commandIDs::copyOctaveBoard,
 		Lumatone::Menu::commandIDs::pasteOctaveBoard,
-		Lumatone::Debug::commandIDs::toggleDeveloperMode
+		Lumatone::Menu::commandIDs::undo,
+		Lumatone::Menu::commandIDs::redo,
+
+		Lumatone::Debug::commandIDs::toggleDeveloperMode,
+
+		Lumatone::Menu::commandIDs::aboutSysEx
 	};
 
 	commands.addArray(ids, numElementsInArray(ids));
@@ -310,6 +320,26 @@ void TerpstraSysExApplication::getCommandInfo(CommandID commandID, ApplicationCo
 {
 	switch (commandID)
 	{
+	case Lumatone::Menu::commandIDs::openSysExMapping:
+		result.setInfo("Load file mapping", "Open a Lumatone key mapping", "File", 0);
+		result.addDefaultKeypress('o', ModifierKeys::ctrlModifier);
+		break;
+
+	case Lumatone::Menu::commandIDs::saveSysExMapping:
+		result.setInfo("Save mapping", "Save the current mapping to file", "File", 0);
+		result.addDefaultKeypress('s', ModifierKeys::ctrlModifier);
+		break;
+
+	case Lumatone::Menu::commandIDs::saveSysExMappingAs:
+		result.setInfo("Save mapping as...", "Save the current mapping to new file", "File", 0);
+		result.addDefaultKeypress('a', ModifierKeys::ctrlModifier);
+		break;
+
+	case Lumatone::Menu::commandIDs::resetSysExMapping:
+		result.setInfo("New", "Start new mapping. Clear all edit fields, do not save current edits.", "File", 0);
+		result.addDefaultKeypress('n', ModifierKeys::ctrlModifier);
+		break;
+
 	case Lumatone::Menu::commandIDs::deleteOctaveBoard:
 		result.setInfo("Delete", "Delete section data", "Edit", 0);
 		result.addDefaultKeypress(KeyPress::deleteKey, ModifierKeys::noModifiers);
@@ -325,6 +355,22 @@ void TerpstraSysExApplication::getCommandInfo(CommandID commandID, ApplicationCo
 		result.addDefaultKeypress('v', ModifierKeys::ctrlModifier);
 		break;
 
+	case Lumatone::Menu::commandIDs::undo:
+		result.setInfo("Undo", "Undo latest edit", "Edit", 0);
+		result.addDefaultKeypress('z', ModifierKeys::ctrlModifier);
+		result.setActive(undoManager.canUndo());
+		break;
+
+	case Lumatone::Menu::commandIDs::redo:
+		result.setInfo("Redo", "Redo latest edit", "Edit", 0);
+		result.addDefaultKeypress('y', ModifierKeys::ctrlModifier);
+		result.setActive(undoManager.canRedo());
+		break;
+
+	case Lumatone::Menu::commandIDs::aboutSysEx:
+		result.setInfo("About Lumatone Editor", "Shows version and copyright", "Help", 0);
+		break;
+
 	case Lumatone::Debug::commandIDs::toggleDeveloperMode:
 		result.setInfo("Toggle Developer Mode", "Show/hide controls for tweaking internal parameters", "Edit", 0);
 		result.addDefaultKeypress('m', juce::ModifierKeys::allKeyboardModifiers);
@@ -340,12 +386,31 @@ bool TerpstraSysExApplication::perform(const InvocationInfo& info)
 {
 	switch (info.commandID)
 	{
+	case Lumatone::Menu::commandIDs::openSysExMapping:
+		return openSysExMapping();
+	case Lumatone::Menu::commandIDs::saveSysExMapping:
+		return saveSysExMapping();
+	case Lumatone::Menu::commandIDs::saveSysExMappingAs:
+		return saveSysExMappingAs();
+	case Lumatone::Menu::commandIDs::resetSysExMapping:
+		return resetSysExMapping();
 	case Lumatone::Menu::commandIDs::deleteOctaveBoard:
+
 		return deleteSubBoardData();
 	case Lumatone::Menu::commandIDs::copyOctaveBoard:
 		return copySubBoardData();
 	case Lumatone::Menu::commandIDs::pasteOctaveBoard:
 		return pasteSubBoardData();
+
+	case Lumatone::Menu::commandIDs::undo:
+		return undo();
+
+	case Lumatone::Menu::commandIDs::redo:
+		return redo();
+
+	case Lumatone::Menu::commandIDs::aboutSysEx:
+		return aboutTerpstraSysEx();
+
 	case Lumatone::Debug::commandIDs::toggleDeveloperMode:
 		return toggleDeveloperMode();
 	default:
@@ -400,6 +465,11 @@ bool TerpstraSysExApplication::resetSysExMapping()
 
 	setHasChangesToSave(false);
 
+	// Clear undoable actions
+	// ToDo (?)
+	undoManager.clearUndoHistory();
+
+
 	// Window title
 	updateMainTitle();
 
@@ -409,6 +479,7 @@ bool TerpstraSysExApplication::resetSysExMapping()
 bool TerpstraSysExApplication::deleteSubBoardData()
 {
 	return ((MainContentComponent*)(mainWindow->getContentComponent()))->deleteCurrentSubBoardData();
+	// ToDo Add to undo history
 }
 
 bool TerpstraSysExApplication::copySubBoardData()
@@ -419,6 +490,40 @@ bool TerpstraSysExApplication::copySubBoardData()
 bool TerpstraSysExApplication::pasteSubBoardData()
 {
 	return ((MainContentComponent*)(mainWindow->getContentComponent()))->pasteCurrentSubBoardData();
+	// ToDo Add to undo history
+}
+
+bool TerpstraSysExApplication::performUndoableAction(UndoableAction* editAction)
+{
+	if (undoManager.perform(editAction))	// UndoManager will check for nullptr and also for disposing of the object
+	{
+		setHasChangesToSave(true);
+		((MainContentComponent*)(mainWindow->getContentComponent()))->refreshKeyDataFields();
+	}
+	else
+		return false;
+}
+
+bool TerpstraSysExApplication::undo()
+{
+	if (undoManager.undo())
+	{
+		setHasChangesToSave(true);
+		((MainContentComponent*)(mainWindow->getContentComponent()))->refreshKeyDataFields();
+	}
+	else
+		return false;
+}
+
+bool TerpstraSysExApplication::redo()
+{
+	if (undoManager.redo())
+	{
+		setHasChangesToSave(true);
+		((MainContentComponent*)(mainWindow->getContentComponent()))->refreshKeyDataFields();
+	}
+	else
+		return false;
 }
 
 bool TerpstraSysExApplication::toggleDeveloperMode()
@@ -551,6 +656,9 @@ bool TerpstraSysExApplication::openFromCurrentFile()
 		// Mark file as unchanged
 		setHasChangesToSave(false);
 
+		// Clear undo history
+		undoManager.clearUndoHistory();
+
 		// Add file to recent files list
 		recentFiles.addFile(currentFile);
 
@@ -583,6 +691,8 @@ bool TerpstraSysExApplication::saveCurrentFile()
 
 	setHasChangesToSave(false);
 
+	// ToDo undo history?
+
 	// Add file to recent files list - or put it on top of the list
 	recentFiles.addFile(currentFile);
 
@@ -594,16 +704,16 @@ void TerpstraSysExApplication::sendCurrentConfigurationToDevice()
 	auto theConfig = ((MainContentComponent*)(mainWindow->getContentComponent()))->getMappingInEdit();
 	
 	// MIDI channel, MIDI note, colour and key type config for all keys
-	getMidiDriver().sendCompleteMapping(theConfig);
+	getLumatoneController().sendCompleteMapping(theConfig);
 
 	// General options
-	getMidiDriver().sendAfterTouchActivation(theConfig.afterTouchActive);
-	getMidiDriver().sendLightOnKeyStrokes(theConfig.lightOnKeyStrokes);
-	getMidiDriver().sendInvertFootController(theConfig.invertFootController);
-	getMidiDriver().sendExpressionPedalSensivity(theConfig.expressionControllerSensivity);
+	getLumatoneController().setAftertouchEnabled(theConfig.afterTouchActive);
+	getLumatoneController().sendLightOnKeyStrokes(theConfig.lightOnKeyStrokes);
+	getLumatoneController().sendInvertFootController(theConfig.invertExpression);
+	getLumatoneController().sendExpressionPedalSensivity(theConfig.expressionControllerSensivity);
 
 	// Velocity curve config
-	getMidiDriver().sendVelocityIntervalConfig(theConfig.velocityIntervalTableValues);
+	getLumatoneController().setVelocityIntervalConfig(theConfig.velocityIntervalTableValues);
 
 	((MainContentComponent*)(mainWindow->getContentComponent()))->getCurvesArea()->sendConfigToController();
 }
@@ -634,7 +744,7 @@ void TerpstraSysExApplication::requestConfigurationFromDevice()
 	TerpstraSysExApplication::getApp().resetSysExMapping();
 
 	// Request MIDI channel, MIDI note, colour and key type config for all keys
-	getMidiDriver().sendGetCompleteMappingRequest();
+	getLumatoneController().sendGetCompleteMappingRequest();
 
 	// General options
 	// ToDo AfterTouchActive
@@ -643,10 +753,10 @@ void TerpstraSysExApplication::requestConfigurationFromDevice()
 	// ToDO expressionControllerSensivity
 
 	// Velocity curve config
-	getMidiDriver().sendVelocityIntervalConfigRequest();
-	getMidiDriver().sendVelocityConfigurationRequest(TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff);
-	getMidiDriver().sendVelocityConfigurationRequest(TerpstraVelocityCurveConfig::VelocityCurveType::fader);
-	getMidiDriver().sendVelocityConfigurationRequest(TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch);
+	getLumatoneController().sendVelocityIntervalConfigRequest();
+	getLumatoneController().sendVelocityConfigRequest();
+	getLumatoneController().sendFaderConfigRequest();
+	getLumatoneController().sendAftertouchConfigRequest();
 }
 
 void TerpstraSysExApplication::updateMainTitle()
@@ -678,31 +788,38 @@ bool TerpstraSysExApplication::aboutTerpstraSysEx()
 		<< String((JUCE_APP_VERSION_HEX >> 8) & 0xff) << "."
 		<< String(JUCE_APP_VERSION_HEX & 0xff) << newLine
 
+		<< "@ Hans Straub, Vincenzo Sicurella 2014 - 2021" << newLine
 		<< newLine
-		<< "Original design @ Dylan Horvath 2007" << newLine
-		<< "Reengineered @ Hans Straub, Vincenzo Sicurella 2014 - 2020" << newLine
+		<< "Based on the program 'TerpstraSysEx' @ Dylan Horvath 2007" << newLine
 		<< newLine
-		<< "For help on using this program, or any questions relating to the Lumatone keyboard, go to http://lumatone.io or http://terpstrakeyboard.com .";
+		<< "For help on using this program, or any questions relating to the Lumatone keyboard, go to" << newLine
+		<< "http://lumatone.io";
+		//<< "or";
+		//<< newLine
+		//<< "http://terpstrakeyboard.com";
 
 	DialogWindow::LaunchOptions options;
 	Label* label = new Label();
 	label->setLookAndFeel(&lookAndFeel);
 	label->setText(m, dontSendNotification);
+	label->setFont(lookAndFeel.getAppFont(LumatoneEditorFont::FranklinGothic));
 	options.content.setOwned(label);
 
 	juce::Rectangle<int> area(0, 0, 400, 200);
 	options.content->setSize(area.getWidth(), area.getHeight());
 
-	options.dialogTitle = "About LumatoneSetup";
-	options.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
+	resizeLabelWithHeight(label, roundToInt(area.getHeight() * 0.24f));
+
+	options.dialogTitle = "About Lumatone Editor";
+	options.dialogBackgroundColour = lookAndFeel.findColour(LumatoneEditorColourIDs::DarkBackground);
 
 	options.escapeKeyTriggersCloseButton = true;
 	options.useNativeTitleBar = false;
-	options.resizable = true;
+	options.resizable = false;
 
-	//const RectanglePlacement placement(RectanglePlacement::xRight + RectanglePlacement::yBottom + RectanglePlacement::doNotResize);
 
 	DialogWindow* dw = options.launchAsync();
+	dw->setLookAndFeel(&lookAndFeel);
 	dw->centreWithSize(400, 260);
 
 	return true;
diff --git a/Source/Main.h b/Source/Main.h
index 9ad8dfee..14025d05 100644
--- a/Source/Main.h
+++ b/Source/Main.h
@@ -11,17 +11,16 @@
 #pragma once
 
 #include "../JuceLibraryCode/JuceHeader.h"
+#include "LumatoneMenu.h"
 #include "MainComponent.h"
-#include "KeyboardDataStructure.h"
+#include "LumatoneController.h"
+
 #include "ViewConstants.h"
-#include "TerpstraMidiDriver.h"
 #include "LumatoneEditorFonts.h"
 #include "ColourPaletteDataStructure.h"
 #include "LocalisationMap.h"
 #include "FirmwareTransfer.h"
 
-typedef TerpstraMidiDriver::FirmwareVersion FirmwareVersion;
-
 //==============================================================================
 class TerpstraSysExApplication : public JUCEApplication
 {
@@ -49,21 +48,20 @@ class TerpstraSysExApplication : public JUCEApplication
 	LumatoneEditorLookAndFeel& getLookAndFeel() { return lookAndFeel; }
 	ComponentBoundsConstrainer* getBoundsConstrainer() { return boundsConstrainer.get(); };
 	RecentlyOpenedFilesList& getRecentFileList() { return recentFiles; }
-	TerpstraMidiDriver& getMidiDriver() { return midiDriver; }
-	DeviceActivityMonitor& getDeviceMonitor() { return *deviceMonitor.get(); }
+	LumatoneController& getLumatoneController() { return lumatoneController; }
 	Array<LumatoneEditorColourPalette>& getColourPalettes() { return colourPalettes; }
 	Font getAppFont(LumatoneEditorFont fontIdIn, float height = 12.0f) { return appFonts.getFont(fontIdIn, height); }
-	int getOctaveBoardSize() const { return octaveBoardSize; }
+	int getOctaveBoardSize() const { return lumatoneController.getOctaveSize(); }
 
-	FirmwareVersion getFirmwareVersion() const { return midiDriver.getFirmwareVersion(); }
-	String getFirmwareVersionStr() const { return midiDriver.getFirmwareVersion().toString(); }
+	FirmwareVersion getFirmwareVersion() const { return lumatoneController.getFirmwareVersion(); }
+	String getFirmwareVersionStr() const { return lumatoneController.getFirmwareVersion().toString(); }
 
 	void reloadColourPalettes();
 	bool saveColourPalette(LumatoneEditorColourPalette& palette, File pathToPalette);
 	bool deletePaletteFile(File pathToPalette);
 
 	// Menu functionality
-	ApplicationCommandManager* getCommandManager() { return commandManager.get(); }
+	Lumatone::Menu::MainMenuModel* getMainMenu() { return menuModel.get(); }
 	void getAllCommands(Array <CommandID>& commands) override;
 	void getCommandInfo(CommandID commandID, ApplicationCommandInfo& result) override;
 	bool perform(const InvocationInfo& info) override;
@@ -77,6 +75,13 @@ class TerpstraSysExApplication : public JUCEApplication
 	bool copySubBoardData();
 	bool pasteSubBoardData();
 
+	void setCalibrationMode(bool calibrationStarted) { inCalibrationMode = calibrationStarted; }
+	bool getInCalibrationMode() const { return inCalibrationMode; }
+
+	bool performUndoableAction(UndoableAction* editAction);
+	bool undo();
+	bool redo();
+
 	bool toggleDeveloperMode();
 
 	bool generalOptionsDialog();
@@ -91,6 +96,7 @@ class TerpstraSysExApplication : public JUCEApplication
 	void sendCurrentConfigurationToDevice();
 	void requestConfigurationFromDevice();
 
+
 	void updateMainTitle();
 
 	bool getHasChangesToSave() const { return hasChangesToSave; }
@@ -164,14 +170,21 @@ class TerpstraSysExApplication : public JUCEApplication
 		JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MainWindow)
 	};
 
+	MainContentComponent* getMainContentComponent();
+
 private:
 	std::unique_ptr<MainWindow> mainWindow;
 
 	std::unique_ptr<ComponentBoundsConstrainer> boundsConstrainer;
 
 	std::unique_ptr<ApplicationCommandManager> commandManager;
+	std::unique_ptr<Lumatone::Menu::MainMenuModel> menuModel;
 	TooltipWindow				tooltipWindow;
 	bool						hasChangesToSave;
+
+	bool						inCalibrationMode = false;
+
+	juce::UndoManager undoManager;
 	
 	LumatoneEditorFonts			appFonts;
 	LumatoneEditorLookAndFeel	lookAndFeel;
@@ -186,13 +199,7 @@ class TerpstraSysExApplication : public JUCEApplication
 
 	Array<LumatoneEditorColourPalette> colourPalettes;
 
-	// MIDI connection
-	TerpstraMidiDriver			midiDriver;
-
-	// Device MIDI monitor
-	std::unique_ptr<DeviceActivityMonitor> deviceMonitor;
-
-	// Size of octaver board. Usually 56, but there are a few devices with55.
-	int octaveBoardSize = 56;
+	// Communication with Lumatone
+	LumatoneController			lumatoneController;
 };
 
diff --git a/Source/MainComponent.cpp b/Source/MainComponent.cpp
index bcf7ddd9..a075d759 100644
--- a/Source/MainComponent.cpp
+++ b/Source/MainComponent.cpp
@@ -20,7 +20,7 @@ MainContentComponent::MainContentComponent()
 	setName("MainContentComponent");
 
 	// Midi input + output
-	midiEditArea.reset(new MidiEditArea(TerpstraSysExApplication::getApp().getLookAndFeel(), TerpstraSysExApplication::getApp().getDeviceMonitor()));
+	midiEditArea.reset(new MidiEditArea(TerpstraSysExApplication::getApp().getLookAndFeel()));
 	addAndMakeVisible(midiEditArea.get());
 
 	// All keys overview
@@ -46,7 +46,7 @@ MainContentComponent::MainContentComponent()
 	addAndMakeVisible(globalSettingsArea.get());
 	globalSettingsArea->listenToColourEditButtons(this);
 
-	TerpstraSysExApplication::getApp().getMidiDriver().addListener(this);
+	TerpstraSysExApplication::getApp().getLumatoneController().addFirmwareListener(this);
 
 	//lblAppName.reset(new Label("lblAppName", TerpstraSysExApplication::getApp().getApplicationName()));
 	lblAppName.reset(new Label("lblAppName", "lumatone editor"));
@@ -74,7 +74,7 @@ MainContentComponent::MainContentComponent()
 
 MainContentComponent::~MainContentComponent()
 {
-    TerpstraSysExApplication::getApp().getMidiDriver().removeListener(this);
+    //TerpstraSysExApplication::getApp().getMidiDriver().removeListener(this);
 
 	midiEditArea = nullptr;
 	allKeysOverview = nullptr;
@@ -109,8 +109,7 @@ void MainContentComponent::setData(TerpstraKeyMapping& newData, bool withRefresh
 
 	if (withRefresh)
 	{
-		refreshAllKeysOverview();
-		noteEditArea->refreshKeyFields();
+		refreshKeyDataFields();
 		generalOptionsArea->loadFromMapping();
 		pedalSensitivityDlg->loadFromMapping();
 		curvesArea->loadFromMapping();
@@ -139,8 +138,7 @@ bool MainContentComponent::deleteCurrentSubBoardData()
 		mappingData.sets[currentSetSelection] = TerpstraKeys();
 
 		// Refresh display
-		refreshAllKeysOverview();
-		noteEditArea->refreshKeyFields();
+		refreshKeyDataFields();
 
 		// Mark that there are changes
 		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
@@ -173,8 +171,7 @@ bool MainContentComponent::pasteCurrentSubBoardData()
 			mappingData.sets[currentSetSelection] = copiedSubBoardData;
 
 			// Refresh display
-			refreshAllKeysOverview();
-			noteEditArea->refreshKeyFields();
+			refreshKeyDataFields();
 
 			// Mark that there are changes
 			TerpstraSysExApplication::getApp().setHasChangesToSave(true);
@@ -193,133 +190,105 @@ bool MainContentComponent::setDeveloperMode(bool developerModeOn)
 	return true;
 }
 
-void MainContentComponent::midiMessageReceived(const MidiMessage& midiMessage)
+void MainContentComponent::octaveColourConfigReceived(int octaveIndex, uint8 rgbFlag, const int* colourData)
 {
-    if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsTerpstraConfigurationDataReceptionMessage(midiMessage)) {
-        auto sysExData = midiMessage.getSysExData();
-
-        int boardNo = sysExData[3];
-        jassert(boardNo >= 1 && boardNo <= NUMBEROFBOARDS);
-        auto midiCmd = sysExData[4];
-        auto answerState = sysExData[5];
-
-        if (answerState == TerpstraMidiDriver::ACK) {
-            // Velocity curves
-            if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsVelocityIntervalConfigReceptionMessage(midiMessage)) {
-                // After the answer state byte there must be 254 bytes of data
-                jassert(midiMessage.getSysExDataSize() >= (6 + 2 * VELOCITYINTERVALTABLESIZE)); // ToDo display error otherwise
-
-                for (int i = 0; i < VELOCITYINTERVALTABLESIZE; i++)
-                    this->mappingData.velocityIntervalTableValues[i] = (sysExData[6 + 2 * i] << 6) + sysExData[7 + 2 * i];
-
-                curvesArea->resized();
-                curvesArea->repaint();
-            } else if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsTerpstraVelocityConfigReceptionMessage(midiMessage, TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff)) {
-                // After the answer state byte there must be 128 bytes of data
-                // Values are in reverse order (shortest ticks count is the highest velocity)
-                jassert(midiMessage.getSysExDataSize() >= 134); // ToDo display error otherwise
-                this->mappingData.noteOnOffVelocityCurveConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
-                for (int x = 0; x < 128; x++)
-                    this->mappingData.noteOnOffVelocityCurveConfig.velocityValues[127 - x] = sysExData[6 + x];
-                curvesArea->loadFromMapping();
-            } else if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsTerpstraVelocityConfigReceptionMessage(midiMessage, TerpstraVelocityCurveConfig::VelocityCurveType::fader)) {
-                // After the answer state byte there must be 128 bytes of data
-                jassert(midiMessage.getSysExDataSize() >= 134); // ToDo display error otherwise
-                this->mappingData.faderConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
-                for (int x = 0; x < 128; x++)
-                    this->mappingData.faderConfig.velocityValues[x] = sysExData[6 + x];
-                curvesArea->loadFromMapping();
-            } else if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsTerpstraVelocityConfigReceptionMessage(midiMessage, TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch)) {
-                // After the answer state byte there must be 128 bytes of data
-                jassert(midiMessage.getSysExDataSize() >= 134); // ToDo display error otherwise
-                this->mappingData.afterTouchConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
-                for (int x = 0; x < 128; x++)
-                    this->mappingData.afterTouchConfig.velocityValues[x] = sysExData[6 + x];
-                curvesArea->loadFromMapping();
-            } else if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsTerpstraVelocityConfigReceptionMessage(midiMessage, TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch)) {
-                // After the answer state byte there must be 128 bytes of data
-                jassert(midiMessage.getSysExDataSize() >= 134); // ToDo display error otherwise
-                this->mappingData.lumaTouchConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
-                for (int x = 0; x < 128; x++)
-                    this->mappingData.lumaTouchConfig.velocityValues[x] = sysExData[6 + x];
-                curvesArea->loadFromMapping();
-            }
-
-            // Key configurations
-            else if (midiCmd == GET_RED_LED_CONFIG || midiCmd == GET_GREEN_LED_CONFIG || midiCmd == GET_BLUE_LED_CONFIG ||
-                midiCmd == GET_CHANNEL_CONFIG || midiCmd == GET_NOTE_CONFIG || midiCmd == GET_KEYTYPE_CONFIG) {
-                // After the answer state byte there must be 56 (or 55) bytes of data (one for each key)
-                jassert(midiMessage.getSysExDataSize() >= TerpstraSysExApplication::getApp().getOctaveBoardSize() + 6); // ToDo display error otherwise
-
-                for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++) {
-                    auto newValue = sysExData[6 + keyIndex];
-
-                    TerpstraKey& keyData = this->mappingData.sets[boardNo - 1].theKeys[keyIndex];
-
-                    switch (midiCmd) {
-                        case GET_RED_LED_CONFIG:
-                            newValue *= 5;
-                            if (newValue > 255) {
-                                jassertfalse;
-                                newValue = 0;
-                            }
-                            keyData.colour = Colour(newValue, keyData.colour.getGreen(), keyData.colour.getBlue());	// This creates an opaque colour (alpha 0xff)
-                            break;
-
-                        case GET_GREEN_LED_CONFIG:
-                            newValue *= 5;
-                            if (newValue > 255) {
-                                jassertfalse;
-                                newValue = 0;
-                            }
-                            keyData.colour = Colour(keyData.colour.getRed(), newValue, keyData.colour.getBlue());
-                            break;
-
-                        case GET_BLUE_LED_CONFIG:
-                            newValue *= 5;
-                            if (newValue > 255) {
-                                jassertfalse;
-                                newValue = 0;
-                            }
-                            keyData.colour = Colour(keyData.colour.getRed(), keyData.colour.getGreen(), newValue);
-                            break;
-
-                        case GET_CHANNEL_CONFIG:
-                            if (newValue > 16) {
-                                jassertfalse;
-                                newValue = 0;
-                            }
-                            keyData.channelNumber = newValue;
-                            break;
-
-                        case GET_NOTE_CONFIG:
-                            if (newValue > 127) {
-                                jassertfalse;
-                                newValue = 0;
-                            }
-                            keyData.noteNumber = newValue;
-                            break;
-
-                        case GET_KEYTYPE_CONFIG:
-                            // ToDo value validation
-                            keyData.keyType = (TerpstraKey::KEYTYPE)newValue;
-                            break;
-
-                        default:
-                            jassertfalse;   // Should not happen
-                            break;
-                    }
-                }
-
-                refreshAllKeysOverview();
-                noteEditArea->refreshKeyFields();
-            }
-        }
-    }
-    else if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsGetFirmwareRevisionResponse(midiMessage))
-    {
-        allKeysOverview->setFirmwareVersion(FirmwareVersion::fromGetFirmwareRevisionMsg(midiMessage));
-    }
+	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	{
+		TerpstraKey& keyData = this->mappingData.sets[octaveIndex - 1].theKeys[keyIndex];
+		auto newValue = colourData[keyIndex];
+
+		if (rgbFlag == 0)
+		{
+			keyData.colour = Colour(newValue, keyData.colour.getGreen(), keyData.colour.getBlue());
+		}
+		else if (rgbFlag == 1)
+		{
+			keyData.colour = Colour(keyData.colour.getRed(), newValue, keyData.colour.getBlue());
+		}
+		else if (rgbFlag == 2)
+		{
+			keyData.colour = Colour(keyData.colour.getRed(), keyData.colour.getGreen(), newValue);
+		}
+		else
+			jassertfalse;
+	}
+
+	refreshKeyDataFields();
+}
+
+void MainContentComponent::octaveChannelConfigReceived(int octaveIndex, const int* channelData)
+{
+	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	{
+		// Check channel values?
+		this->mappingData.sets[octaveIndex - 1].theKeys[keyIndex].channelNumber = channelData[keyIndex];
+	}
+
+	refreshKeyDataFields();
+}
+
+void MainContentComponent::octaveNoteConfigReceived(int octaveIndex, const int* noteData)
+{
+	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	{
+		// Check note values?
+		this->mappingData.sets[octaveIndex - 1].theKeys[keyIndex].noteNumber = noteData[keyIndex];
+	}
+
+	refreshKeyDataFields();
+}
+
+void MainContentComponent::keyTypeConfigReceived(int octaveIndex, const int* keyTypeData)
+{
+	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
+	{
+		// Check type values?
+		this->mappingData.sets[octaveIndex - 1].theKeys[keyIndex].keyType = LumatoneKeyType(keyTypeData[keyIndex]);
+	}
+
+	refreshKeyDataFields();
+}
+
+void MainContentComponent::velocityConfigReceived(const int* velocityData)
+{
+	this->mappingData.noteOnOffVelocityCurveConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
+	for (int i = 0; i < 128; i++)
+		this->mappingData.noteOnOffVelocityCurveConfig.velocityValues[i] = velocityData[127 - i]; // Reversed
+	curvesArea->loadFromMapping();
+}
+
+void MainContentComponent::aftertouchConfigReceived(const int* aftertouch)
+{
+	this->mappingData.afterTouchConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
+	memmove(this->mappingData.afterTouchConfig.velocityValues, aftertouch, sizeof(int) * 128);
+	curvesArea->loadFromMapping();
+}
+
+void MainContentComponent::velocityIntervalConfigReceived(const int* velocityData)
+{
+	memmove(this->mappingData.velocityIntervalTableValues, velocityData, sizeof(int) * VELOCITYINTERVALTABLESIZE);
+	curvesArea->loadFromMapping();
+}
+
+void MainContentComponent::faderConfigReceived(const int* faderData)
+{
+	this->mappingData.faderConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
+	memmove(this->mappingData.faderConfig.velocityValues, faderData, sizeof(int) * 128);
+	curvesArea->loadFromMapping();
+}
+
+void MainContentComponent::lumatouchConfigReceived(const int* lumatouchData)
+{
+	this->mappingData.lumaTouchConfig.editStrategy = TerpstraVelocityCurveConfig::EDITSTRATEGYINDEX::freeDrawing;
+	memmove(this->mappingData.lumaTouchConfig.velocityValues, lumatouchData, sizeof(int) * 128);
+	curvesArea->loadFromMapping();
+}
+
+void MainContentComponent::firmwareRevisionReceived(FirmwareVersion version)
+{
+	// Make sure changes happen in proper order
+	noteEditArea->resetOctaveSize();
+	allKeysOverview->resetOctaveSize();
 }
 
 void MainContentComponent::changeListenerCallback(ChangeBroadcaster *source)
@@ -417,7 +386,9 @@ void MainContentComponent::resized()
 	lblAppVersion->setTopLeftPosition(lblAppName->getRight(), lblAppName->getBottom() - lblAppVersion->getHeight());
 }
 
-void MainContentComponent::refreshAllKeysOverview()
+void MainContentComponent::refreshKeyDataFields()
 {
 	allKeysOverview->repaint();
+	noteEditArea->refreshKeyFields();
 }
+
diff --git a/Source/MainComponent.h b/Source/MainComponent.h
index 88e0a301..528d22b5 100644
--- a/Source/MainComponent.h
+++ b/Source/MainComponent.h
@@ -15,7 +15,7 @@
 #include "AllKeysOverview.h"
 #include "ViewComponents.h"
 #include "KeyboardDataStructure.h"
-#include "TerpstraMidiDriver.h"
+#include "LumatoneController.h"
 #include "MidiEditArea.h"
 #include "NoteEditArea.h"
 #include "GeneralOptionsDlg.h"
@@ -33,7 +33,7 @@
     your controls and content.
 */
 class MainContentComponent : public Component, 
-							 public TerpstraMidiDriver::Listener, 
+							 public LumatoneController::FirmwareListener,
 							 public ChangeListener,
 							 public Button::Listener
 {
@@ -62,12 +62,6 @@ class MainContentComponent : public Component,
 
 	bool setDeveloperMode(bool developerModeOn);
 
-	// Implementation of TerpstraNidiDriver::Listener
-	void midiMessageReceived(const MidiMessage& midiMessage) override;
-	void midiMessageSent(const MidiMessage& midiMessage) override {}
-	void midiSendQueueSize(int queueSize) override {}
-    void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {}
-
 	// Implementation of ChangeListener
 	void changeListenerCallback(ChangeBroadcaster *source) override;
 
@@ -78,7 +72,29 @@ class MainContentComponent : public Component,
     void paint (Graphics&);
     void resized();
 
-	void refreshAllKeysOverview();
+	void refreshKeyDataFields();
+
+	// Implementation of LumatoneController::FirmwareListener
+
+	void octaveColourConfigReceived(int octaveIndex, uint8 rgbFlag, const int* colourData) override;
+
+	void octaveChannelConfigReceived(int octaveIndex, const int* channelData) override;
+
+	void octaveNoteConfigReceived(int octaveIndex, const int* noteData) override;
+
+	void keyTypeConfigReceived(int octaveIndex, const int* keyTypeData) override;
+
+	void velocityConfigReceived(const int* velocityData) override;
+
+	void aftertouchConfigReceived(const int* aftertouchData) override;
+
+	void velocityIntervalConfigReceived(const int* velocityData) override;
+
+	void faderConfigReceived(const int* faderData) override;
+
+	void lumatouchConfigReceived(const int* lumatouchData) override;
+
+	void firmwareRevisionReceived(FirmwareVersion version) override;
 
 private:
     //==============================================================================
diff --git a/Source/MidiEditArea.cpp b/Source/MidiEditArea.cpp
index 4e1ebca8..599abbaa 100644
--- a/Source/MidiEditArea.cpp
+++ b/Source/MidiEditArea.cpp
@@ -28,13 +28,13 @@
 //[MiscUserDefs] You can add your own user definitions and misc code here...
 
 // Index in edit mode tab coincides with sysExSendingMode. In case that changes in the future, modify this here.
-TerpstraMidiDriver::sysExSendingMode editModeTabIndexToMidiSysExSendingMode(int tabIndex) { return static_cast<TerpstraMidiDriver::sysExSendingMode>(tabIndex); }
+LumatoneController::sysExSendingMode editModeTabIndexToMidiSysExSendingMode(int tabIndex) { return static_cast<LumatoneController::sysExSendingMode>(tabIndex); }
 
 //[/MiscUserDefs]
 
 //==============================================================================
-MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn, DeviceActivityMonitor& deviceMonitorIn)
-    : lookAndFeel(lookAndFeelIn),errorVisualizer(lookAndFeelIn), deviceMonitor(deviceMonitorIn)
+MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn)
+    : lookAndFeel(lookAndFeelIn)
 {
     //[Constructor_pre] You can add your own custom stuff here..
 	setName("MidiEditArea");
@@ -133,10 +133,12 @@ MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn, DeviceActi
 
 
     //[UserPreSize]
-	lookAndFeel.setupComboBox(*cbMidiInput.get());
-	lookAndFeel.setupComboBox(*cbMidiOutput.get());
-
+	cbMidiInput->getProperties().set(LumatoneEditorStyleIDs::popupMenuTargetWidth, 1);
+	cbMidiInput->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour, lookAndFeel.findColour(ComboBox::ColourIds::backgroundColourId).toString());
 	cbMidiInput->setVisible(false);
+
+	cbMidiOutput->getProperties().set(LumatoneEditorStyleIDs::popupMenuTargetWidth, 1);
+	cbMidiOutput->getProperties().set(LumatoneEditorStyleIDs::popupMenuBackgroundColour, lookAndFeel.findColour(ComboBox::ColourIds::backgroundColourId).toString());
 	cbMidiOutput->setVisible(false);
 
 	lblConnectionState->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
@@ -151,16 +153,10 @@ MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn, DeviceActi
 	liveEditorBtn->setClickingTogglesState(true);
 	liveEditorBtn->setRadioGroupId(10, dontSendNotification);
 	liveEditorBtn->setToggleState(true, dontSendNotification);
-	lookAndFeel.setupTextButton(*offlineEditorBtn);
-	lookAndFeel.setupTextButton(*liveEditorBtn);
     liveEditorBtn->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, 0.6f);
     offlineEditorBtn->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, 0.6f);
 
-	refreshInputDevicesAndSetSelected(0, dontSendNotification);
-	refreshOutputDevicesAndSetSelected(0, dontSendNotification);
-
 	btnAutoConnect->setClickingTogglesState(true);
-	lookAndFeel.setupTextButton(*btnAutoConnect.get());
 
 	ioAreaFlexBox.alignContent = FlexBox::AlignContent::center;
 	ioAreaFlexBox.alignItems = FlexBox::AlignItems::center;
@@ -171,18 +167,15 @@ MidiEditArea::MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn, DeviceActi
 
 
     //[Constructor] You can add your own custom stuff here..
-	TerpstraSysExApplication::getApp().getMidiDriver().addListener(this);
-
+	TerpstraSysExApplication::getApp().getLumatoneController().addStatusListener(this);
+	auto inputs = TerpstraSysExApplication::getApp().getLumatoneController().getMidiInputList();
+	auto outputs = TerpstraSysExApplication::getApp().getLumatoneController().getMidiOutputList();
+	refreshInputMenuAndSetSelected(0, dontSendNotification);
+	refreshOutputMenuAndSetSelected(0, dontSendNotification);
 	setConnectivity(false);
 
-    deviceMonitor.addChangeListener(this);
-
-    btnAutoConnect->setToggleState(deviceMonitor.willDetectDeviceIfDisconnected(), sendNotificationSync);
-	if (deviceMonitor.getMode() < DeviceActivityMonitor::DetectConnectionMode::waitingForInactivity)
-	{
-		startTimer(deviceRefreshTimeoutMs);
-	}
-
+    btnAutoConnect->setToggleState(TerpstraSysExApplication::getApp().getLumatoneController().isDetectingLumatone(), sendNotificationSync);
+	
     //[/Constructor]
 }
 
@@ -204,8 +197,8 @@ MidiEditArea::~MidiEditArea()
 
 
     //[Destructor]. You can add your own custom destruction code here..
-	deviceMonitor.stopThread(100);
-	TerpstraSysExApplication::getApp().getMidiDriver().removeListener(this);
+	//deviceMonitor.stopThread(100);
+	TerpstraSysExApplication::getApp().getLumatoneController().removeStatusListener(this);
     //[/Destructor]
 }
 
@@ -346,15 +339,15 @@ void MidiEditArea::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
     {
         //[UserComboBoxCode_cbMidiInput] -- add your combo box handling code here..
 		if (cbMidiInput->getSelectedItemIndex() >= 0)
-			TerpstraSysExApplication::getApp().getMidiDriver().setMidiInput(cbMidiInput->getSelectedItemIndex());
+			TerpstraSysExApplication::getApp().getLumatoneController().setMidiInput(cbMidiInput->getSelectedItemIndex());
 
 		if (cbMidiInput->getSelectedItemIndex() < 0 || cbMidiOutput->getSelectedItemIndex() < 0)
 		{
 			setConnectivity(false);
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::error,
-				translate("Select both a MIDI input and output"));
+			//errorVisualizer.setErrorLevel(
+			//	*lblConnectionState.get(),
+			//	HajuErrorVisualizer::ErrorLevel::error,
+			//	translate("Select both a MIDI input and output"));
 		}
 		else
 		{
@@ -366,15 +359,15 @@ void MidiEditArea::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
     {
         //[UserComboBoxCode_cbMidiOutput] -- add your combo box handling code here..
 		if (cbMidiOutput->getSelectedItemIndex() >= 0)
-			TerpstraSysExApplication::getApp().getMidiDriver().setMidiOutput(cbMidiOutput->getSelectedItemIndex());
+			TerpstraSysExApplication::getApp().getLumatoneController().setMidiOutput(cbMidiOutput->getSelectedItemIndex());
 
 		if (cbMidiInput->getSelectedItemIndex() < 0 || cbMidiOutput->getSelectedItemIndex() < 0)
 		{
 			setConnectivity(false);
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::error,
-				translate("Select both a MIDI input and output"));
+			//errorVisualizer.setErrorLevel(
+			//	*lblConnectionState.get(),
+			//	HajuErrorVisualizer::ErrorLevel::error,
+			//	translate("Select both a MIDI input and output"));
 		}
 		else
 		{
@@ -398,20 +391,19 @@ void MidiEditArea::buttonClicked (juce::Button* buttonThatWasClicked)
         //[UserButtonCode_btnAutoConnect] -- add your button handler code here..
 		cbMidiInput->setVisible(!btnAutoConnect->getToggleState());
 		cbMidiOutput->setVisible(!btnAutoConnect->getToggleState());
-        deviceMonitor.setDetectDeviceIfDisconnected(btnAutoConnect->getToggleState());
 
         if (btnAutoConnect->getToggleState())
 		{
-			deviceMonitor.initializeDeviceDetection();
+			TerpstraSysExApplication::getApp().getLumatoneController().detectAndConnectToLumatone();
 			lblConnectionState->setText(translate("Searching for Lumatone..."), dontSendNotification);
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::error,
-				translate("Waiting for response from connected devices..."));
+			//errorVisualizer.setErrorLevel(
+			//	*lblConnectionState.get(),
+			//	HajuErrorVisualizer::ErrorLevel::error,
+			//	translate("Waiting for response from connected devices..."));
 		}
 		else
 		{
-			deviceMonitor.signalThreadShouldExit();
+			TerpstraSysExApplication::getApp().getLumatoneController().stopAutoConnection();
 			lblConnectionState->setText(translate("Disconnected"), dontSendNotification);
 			startTimer(deviceRefreshTimeoutMs);
 		}
@@ -425,20 +417,20 @@ void MidiEditArea::buttonClicked (juce::Button* buttonThatWasClicked)
 	{
 		auto sysExSendingMode = editModeTabIndexToMidiSysExSendingMode((int)!liveEditorBtn->getToggleState());
 
-		TerpstraSysExApplication::getApp().getMidiDriver().setSysExSendingMode(sysExSendingMode);
+		TerpstraSysExApplication::getApp().getLumatoneController().setSysExSendingMode(sysExSendingMode);
 
 		switch (sysExSendingMode)
 		{
-		case TerpstraMidiDriver::sysExSendingMode::liveEditor:
+		case LumatoneController::sysExSendingMode::liveEditor:
 			onOpenConnectionToDevice();
 			break;
 
-		case TerpstraMidiDriver::sysExSendingMode::offlineEditor:
+		case LumatoneController::sysExSendingMode::offlineEditor:
 			lblConnectionState->setText(translate("Offline"), NotificationType::dontSendNotification);
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::noError,
-				"Offline");
+			//errorVisualizer.setErrorLevel(
+			//	*lblConnectionState.get(),
+			//	HajuErrorVisualizer::ErrorLevel::noError,
+			//	"Offline");
 			break;
 
 		default:
@@ -479,15 +471,23 @@ void MidiEditArea::setConnectivity(bool isConnectedIn)
 
 	if (isConnected)
 	{
+		stopTimer();
+
 		if (liveEditorBtn->getToggleState())
 			lblConnectionState->setText(translate("Connected"), dontSendNotification);
 		else
 			lblConnectionState->setText(translate("Offline"), dontSendNotification);
 	}
-	else if (btnAutoConnect->getToggleState())
-		lblConnectionState->setText(translate("Searching for Lumatone..."), dontSendNotification);
 	else
-		lblConnectionState->setText(translate("Disconnected"), dontSendNotification);
+	{	
+		if (btnAutoConnect->getToggleState())
+			lblConnectionState->setText(translate("Searching for Lumatone..."), dontSendNotification);
+		else
+		{
+			lblConnectionState->setText(translate("Disconnected"), dontSendNotification);
+			startTimer(deviceRefreshTimeoutMs);
+		}
+	}
 
 	lblConnectionState->setColour(Label::ColourIds::textColourId, connectedColours[isConnectedIn]);
 
@@ -496,237 +496,168 @@ void MidiEditArea::setConnectivity(bool isConnectedIn)
 }
 
 // Called when DeviceActivityMonitor detects a change in devices
-void MidiEditArea::changeListenerCallback(ChangeBroadcaster* source)
-{
-	if (source == static_cast<ChangeBroadcaster*>(&deviceMonitor))
-	{
-		if (deviceMonitor.isConnectionEstablished())
-		{
-            // Manual connection
-            if (isWaitingForConnectionTest)
-            {
-                setConnectivity(true);
-                onOpenConnectionToDevice();
-
-				deviceMonitor.startThread();
-            }
-
-            // Auto-connection
-            else
-            {
-                int currentOutputIndex = deviceMonitor.getConfirmedOutputIndex();
-                int currentInputIndex = deviceMonitor.getConfirmedInputIndex();
-
-                if (currentOutputIndex >= 0 && currentInputIndex >= 0)
-                {
-                    // TODO: more planned-out / unified connection between manual & automatic
-
-                    // + 1 for ComboBox indicies
-                    refreshOutputDevicesAndSetSelected(currentOutputIndex + 1, dontSendNotification);
-                    refreshInputDevicesAndSetSelected(currentInputIndex + 1, dontSendNotification);
-
-                    setConnectivity(true);
-
-					if (deviceMonitor.getMode() != DeviceActivityMonitor::DetectConnectionMode::gettingFirmwareVersion)
-						onOpenConnectionToDevice();
-                }
-                else
-                {
-                    DBG("One or both device indicies returned are invalid");
-                    setConnectivity(false);
-                }
-            }
-
-			// Record firmware version of connected Lumatone
-			TerpstraSysExApplication::getApp().getMidiDriver().sendGetFirmwareRevisionRequest();
-		}
-
-		// Disconnected for some reason
-        else
-        {
-			if (deviceMonitor.getMode() != DeviceActivityMonitor::DetectConnectionMode::waitingForFirmwareUpdate)
-				setConnectivity(false);
-
-			if (deviceMonitor.getMode() < DeviceActivityMonitor::DetectConnectionMode::waitingForInactivity)
-				startTimer(deviceRefreshTimeoutMs);
-
-            if (isWaitingForConnectionTest)
-            {
-                lblConnectionState->setText(translate("No answer"), NotificationType::dontSendNotification);
-                errorVisualizer.setErrorLevel(
-                    *lblConnectionState.get(),
-                    HajuErrorVisualizer::ErrorLevel::error,
-                    "No answer");
-            }
-            else
-            {
-                refreshInputDevicesAndSetSelected(0);
-                refreshOutputDevicesAndSetSelected(0);
-            }
-		}
-	}
-
-}
 
-void MidiEditArea::attemptDeviceConnection()
+//void MidiEditArea::connectionChanged(bool hasConnection)
+//{
+//	if (hasConnection && btnAutoConnect->getToggleState() == false)
+//	{
+//		DBG("MIDIAREA SETTING DEVICES");
+//		TerpstraSysExApplication::getApp().getLumatoneController().setMidiInput(cbMidiInput->getSelectedId() - 1);
+//		TerpstraSysExApplication::getApp().getLumatoneController().setMidiOutput(cbMidiOutput->getSelectedId() - 1);
+//	}
+//}
+
+void MidiEditArea::connectionEstablished(int inputDevice, int outputDevice)
 {
-    jassert(!isConnected);
-
-    lblConnectionState->setText("Connecting...", NotificationType::dontSendNotification);
-    errorVisualizer.setErrorLevel(
-        *lblConnectionState.get(),
-        HajuErrorVisualizer::ErrorLevel::noError,
-        "Connecting...");
-
-    if (deviceMonitor.isConnectionEstablished())
+    if (inputDevice >= 0 && outputDevice >= 0)
     {
-        onOpenConnectionToDevice();
+		refreshInputMenuAndSetSelected(inputDevice + 1, dontSendNotification);
+		refreshOutputMenuAndSetSelected(outputDevice + 1, dontSendNotification);
+        setConnectivity(true);
+
+		onOpenConnectionToDevice();
     }
     else
     {
-		isWaitingForConnectionTest = true;
-		deviceMonitor.testCurrentDevices();
-        //jassert(isWaitingForConnectionTest); // Triggered if a test is requested before opening any devices
+		jassertfalse;
     }
+
+	//deviceMonitor.intializeConnectionLossDetection();
 }
 
-void MidiEditArea::onOpenConnectionToDevice()
+void MidiEditArea::connectionLost()
 {
-	//jassert(cbMidiInput->getSelectedItemIndex() >= 0 && cbMidiOutput->getSelectedItemIndex() >= 0 && liveEditorBtn->getToggleState());
-
-	// Send current configuration to device, if desired
-	auto retc = AlertWindow::showOkCancelBox(
-		AlertWindow::AlertIconType::QuestionIcon,
-		translate("Establishing connection"),
-		translate("Do you want to send the current setup to your Lumatone?")
-	);
+	if (!btnAutoConnect->getToggleState())
+		startTimer(deviceRefreshTimeoutMs);
 
-	if (retc)
+	if (isWaitingForConnectionTest)
 	{
-		TerpstraSysExApplication::getApp().sendCurrentConfigurationToDevice();
-		liveEditorBtn->setToggleState(true, dontSendNotification);
-		lblConnectionState->setText("Connected", NotificationType::dontSendNotification);
+		lblConnectionState->setText(translate("No answer"), NotificationType::dontSendNotification);
+		//errorVisualizer.setErrorLevel(
+		//    *lblConnectionState.get(),
+		//    HajuErrorVisualizer::ErrorLevel::error,
+		//    "No answer");
 	}
 	else
 	{
-		offlineEditorBtn->setToggleState(true, sendNotification);
-		lblConnectionState->setText("Offline", NotificationType::dontSendNotification);
+		setConnectivity(false);
 	}
 }
 
-void MidiEditArea::refreshInputDevicesAndSetSelected(int inputDeviceIndex, juce::NotificationType notificationType)
+void MidiEditArea::attemptDeviceConnection()
 {
-	cbMidiInput->clear(NotificationType::dontSendNotification);
-	int i = 1;
-	for (auto device : TerpstraSysExApplication::getApp().getMidiDriver().getMidiInputList())
-		cbMidiInput->addItem(device.name, i++);
-	cbMidiInput->setSelectedId(inputDeviceIndex, notificationType);
-}
+    jassert(!isConnected);
 
-void MidiEditArea::refreshOutputDevicesAndSetSelected(int outputDeviceIndex, juce::NotificationType notificationType)
-{
-	cbMidiOutput->clear(NotificationType::dontSendNotification);
-	int i = 1;
-	for (auto device : TerpstraSysExApplication::getApp().getMidiDriver().getMidiOutputList())
-		cbMidiOutput->addItem(device.name, i++);
-	cbMidiOutput->setSelectedId(outputDeviceIndex, notificationType);
-}
+    lblConnectionState->setText("Connecting...", NotificationType::dontSendNotification);
+    //errorVisualizer.setErrorLevel(
+    //    *lblConnectionState.get(),
+    //    HajuErrorVisualizer::ErrorLevel::noError,
+    //    "Connecting...");
 
-void MidiEditArea::midiMessageReceived(const MidiMessage& midiMessage)
-{
-	if (midiMessage.isSysEx() && midiMessage.getSysExDataSize() < 6)
+	if (TerpstraSysExApplication::getApp().getLumatoneController().isConnected())
 	{
-		errorVisualizer.setErrorLevel(
-			*lblConnectionState.get(),
-			HajuErrorVisualizer::ErrorLevel::error,
-			"Message too short");
-
-		return;
+		onOpenConnectionToDevice();
 	}
-
-	if (TerpstraSysExApplication::getApp().getMidiDriver().messageIsTerpstraConfigurationDataReceptionMessage(midiMessage))
+	else
 	{
-		auto sysExData = midiMessage.getSysExData();
-		auto answerState = sysExData[5];
+		//isWaitingForConnectionTest = true;
+		//TerpstraSysExApplication::getApp().getLumatoneController().testCurrentDeviceConnection();
+		//jassert(isWaitingForConnectionTest); // Triggered if a test is requested before opening any devices
+	}
+}
 
-		switch (answerState)
-		{
-		//lblConnectionState->setText("Connected", NotificationType::dontSendNotification);
+void MidiEditArea::onOpenConnectionToDevice()
+{
+	jassert(cbMidiInput->getSelectedItemIndex() >= 0 && cbMidiOutput->getSelectedItemIndex() >= 0);
 
-		case TerpstraMidiDriver::TerpstraMIDIAnswerReturnCode::NACK:  // Not recognized
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::error,
-				"Not Recognized");
-			break;
+	jassert(alert == nullptr);
+	// This can get spammed, and needs a real solution, but for now this will prevent it in releases - Vito
+	if (alert == nullptr)
+	{
+		// Get firmware version so we can use the correct commands
+		TerpstraSysExApplication::getApp().getLumatoneController().sendGetFirmwareRevisionRequest();
 
-		case TerpstraMidiDriver::TerpstraMIDIAnswerReturnCode::ACK:  // Acknowledged, OK
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::noError,
-				"Ack");
-			break;
+		alert.reset(new AlertWindow("Connection established!", translate("Do you want to send the current setup to your Lumatone?"), AlertWindow::AlertIconType::QuestionIcon, getParentComponent()));
+		alert->addButton("Send Editor layout", 1);
+		alert->addButton("Keep Editing Offline", 0);
+		alert->addButton("Import From Lumatone", 2);
+		alert->setLookAndFeel(&lookAndFeel);
 
-		case TerpstraMidiDriver::TerpstraMIDIAnswerReturnCode::BUSY: // Controller busy
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::warning,
-				"Busy");
-			break;
+/*		alert = lookAndFeel.createAlertWindow("Connection established!", translate("Do you want to send the current setup to your Lumatone?"),
+			"Import from Lumatone",
+			"Send layout",
+			"Edit Offline",
+			AlertWindow::AlertIconType::WarningIcon,
+			3, getParentComponent())*/;
 
-		case TerpstraMidiDriver::TerpstraMIDIAnswerReturnCode::ERROR:    // Error
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::error,
-				"Error from device");
-			break;
+		auto retc = alert->runModalLoop();
 
-		default:
-			errorVisualizer.setErrorLevel(
-				*lblConnectionState.get(),
-				HajuErrorVisualizer::ErrorLevel::noError,
-				"");
-			break;
+		if (retc == 1)
+		{
+			TerpstraSysExApplication::getApp().requestConfigurationFromDevice();
+			liveEditorBtn->setToggleState(true, NotificationType::dontSendNotification);
+			lblConnectionState->setText("Connected", NotificationType::dontSendNotification);
+		}
+		else if (retc == 2)
+		{
+			TerpstraSysExApplication::getApp().sendCurrentConfigurationToDevice();
+			liveEditorBtn->setToggleState(true, dontSendNotification);
+			lblConnectionState->setText("Connected", NotificationType::dontSendNotification);
+		}
+		else
+		{
+			offlineEditorBtn->setToggleState(true, NotificationType::sendNotification);
+			lblConnectionState->setText("Offline", NotificationType::dontSendNotification);
 		}
 
-        if (!isConnected && deviceMonitor.getMode() < DeviceActivityMonitor::DetectConnectionMode::lookingForDevice)
-        {
-			setConnectivity(true);
-            onOpenConnectionToDevice();
-        }
+		//alert->setLookAndFeel(nullptr);
+		alert = nullptr;
 	}
 }
 
-void MidiEditArea::timerCallback()
+void MidiEditArea::refreshInputMenuAndSetSelected(int inputDeviceIndex, juce::NotificationType notificationType)
 {
-    if (isConnected || deviceMonitor.getMode() == DeviceActivityMonitor::DetectConnectionMode::waitingForInactivity)
-    {
-		stopTimer();
-    }
-    else
-    {
-        TerpstraSysExApplication::getApp().getMidiDriver().refreshDeviceLists();
-
-        refreshInputDevicesAndSetSelected(
-            TerpstraSysExApplication::getApp().getMidiDriver().getLastMidiInputIndex() + 1,
-            juce::NotificationType::dontSendNotification
-        );
+	cbMidiInput->clear(NotificationType::dontSendNotification);
+	int i = 1;
+	for (auto device : TerpstraSysExApplication::getApp().getLumatoneController().getMidiInputList())
+		cbMidiInput->addItem(device.name, i++);
 
-        refreshOutputDevicesAndSetSelected(
-            TerpstraSysExApplication::getApp().getMidiDriver().getLastMidiOutputIndex() + 1,
-            juce::NotificationType::dontSendNotification
-        );
-    }
+	if (inputDeviceIndex > 0)
+		cbMidiInput->setSelectedId(inputDeviceIndex, notificationType);
 }
 
-void MidiEditArea::generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel)
+void MidiEditArea::refreshOutputMenuAndSetSelected(int outputDeviceIndex, juce::NotificationType notificationType)
 {
-    lblConnectionState->setText(textMessage, NotificationType::dontSendNotification);
-    errorVisualizer.setErrorLevel(*lblConnectionState.get(), errorLevel, textMessage);
+	cbMidiOutput->clear(NotificationType::dontSendNotification);
+	int i = 1;
+	for (auto device : TerpstraSysExApplication::getApp().getLumatoneController().getMidiOutputList())
+		cbMidiOutput->addItem(device.name, i++);
+
+	if (outputDeviceIndex > 0)
+		cbMidiOutput->setSelectedId(outputDeviceIndex, notificationType);
 }
 
+void MidiEditArea::timerCallback()
+{
+	if (isConnected)
+	{
+		stopTimer();
+	}
+	else
+	{
+		TerpstraSysExApplication::getApp().getLumatoneController().refreshAvailableMidiDevices();
 
+		refreshInputMenuAndSetSelected(
+			TerpstraSysExApplication::getApp().getLumatoneController().getMidiInputIndex() + 1,
+			juce::NotificationType::dontSendNotification
+		);
 
+		refreshOutputMenuAndSetSelected(
+			TerpstraSysExApplication::getApp().getLumatoneController().getMidiOutputIndex() + 1,
+			juce::NotificationType::dontSendNotification
+		);
+	}
+}
 //[/MiscUserCode]
 
 
diff --git a/Source/MidiEditArea.h b/Source/MidiEditArea.h
index a7db7d72..2ce58a49 100644
--- a/Source/MidiEditArea.h
+++ b/Source/MidiEditArea.h
@@ -38,39 +38,33 @@
                                                                     //[/Comments]
 */
 class MidiEditArea  : public Component,
-                      public TerpstraMidiDriver::Listener,
-                      public juce::ChangeListener,
-                      public Timer,
+                      public LumatoneController::StatusListener,
                       public juce::ComboBox::Listener,
-                      public juce::Button::Listener
+                      public juce::Button::Listener,
+                      public juce::Timer
 {
 public:
     //==============================================================================
-    MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn, DeviceActivityMonitor& deviceMonitorIn);
+    MidiEditArea (LumatoneEditorLookAndFeel& lookAndFeelIn);
     ~MidiEditArea() override;
 
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
     void lookAndFeelChanged() override;
 
-    // Implementation of ChangeListener
-    // Called when DeviceActivityMonitor detects a change in devices
-    void changeListenerCallback(ChangeBroadcaster* source) override;
-
     void attemptDeviceConnection();
 	void onOpenConnectionToDevice();
 
     // For now, preserve connection functionality and make sure internal combo boxes are up to date
-    void refreshInputDevicesAndSetSelected(int inputDeviceIndex, juce::NotificationType notificationType = NotificationType::sendNotification);
-    void refreshOutputDevicesAndSetSelected(int outputDeviceIndex, juce::NotificationType notificationType = NotificationType::sendNotification);
+    void refreshInputMenuAndSetSelected(int inputDeviceIndex, juce::NotificationType notificationType = NotificationType::sendNotification);
+    void refreshOutputMenuAndSetSelected(int outputDeviceIndex, juce::NotificationType notificationType = NotificationType::sendNotification);
+
+	// Implementation of LumatoneController::StatusListener
+    //void availableDevicesChanged(const Array<MidiDeviceInfo>& inputDevices, int lastInputDevice, const Array<MidiDeviceInfo>& outputDevices, int lastOutputDevice) override;
+    void connectionEstablished(int inputDevice, int outputDevice) override;
+    void connectionLost() override;
 
-	// Implementation of TerpstraMidiDriver::Listener
-	void midiMessageReceived(const MidiMessage& midiMessage) override;
-	void midiMessageSent(const MidiMessage& midiMessage) override {}
-	void midiSendQueueSize(int queueSize) override {}
-	void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override;
 
-    // Implementation of juce::Timer
     void timerCallback() override;
 
 private:
@@ -96,10 +90,6 @@ class MidiEditArea  : public Component,
 		offlineEditor = 1
 	};
 
-	HajuErrorVisualizer         errorVisualizer;
-
-    DeviceActivityMonitor&       deviceMonitor;
-
     bool                        isConnected = false;
     bool                        isWaitingForConnectionTest = false;
 
@@ -121,6 +111,8 @@ class MidiEditArea  : public Component,
     //==============================================================================
     // Helpers
 
+    std::unique_ptr<AlertWindow>     alert;
+
     FlexBox          ioAreaFlexBox;
 
     Rectangle<int>   lumatoneLabelBounds;
diff --git a/Source/NoteEditArea.cpp b/Source/NoteEditArea.cpp
index e75a5754..847ab694 100644
--- a/Source/NoteEditArea.cpp
+++ b/Source/NoteEditArea.cpp
@@ -29,10 +29,6 @@
 
 //[MiscUserDefs] You can add your own user definitions and misc code here...
 
-// DEBUG
-static Random r;
-
-
 //[/MiscUserDefs]
 
 //==============================================================================
@@ -54,9 +50,9 @@ NoteEditArea::NoteEditArea ()
 	editFunctionsTab->setIndent(0);
 	editFunctionsTab->setOutline(0);
 
-  labelWindowTitle.reset (new juce::Label ("labelWindowTitle", translate("AssignKeys")));
+	labelWindowTitle.reset (new juce::Label ("labelWindowTitle", translate("AssignKeys")));
 	labelWindowTitle->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-  addAndMakeVisible (labelWindowTitle.get());
+	addAndMakeVisible (labelWindowTitle.get());
 
   //[UserPreSize]
 
@@ -75,12 +71,7 @@ NoteEditArea::NoteEditArea ()
 	octaveBoardSelectorTab->addChangeListener(this);
 
 	// Single Key fields
-	for (int i = 0; i < TerpstraSysExApplication::getApp().getOctaveBoardSize(); i++)
-	{
-		terpstraKeyFields[i].reset(new TerpstraKeyEdit());
-		addAndMakeVisible(terpstraKeyFields[i].get());
-		terpstraKeyFields[i]->addMouseListener(this, true);
-	}
+	resetOctaveSize(false);
 
     //[/UserPreSize]
 
@@ -194,8 +185,6 @@ void NoteEditArea::resized()
 void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 {
     //[UserCode_mouseDown] -- Add your code here...
-	bool mappingChanged = false;
-
 	// Selection of single key fields
 	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
 	{
@@ -212,11 +201,23 @@ void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 			switch (editMode)
 			{
 			case noteEditMode::SingleNoteAssignMode:
-				mappingChanged = dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(editMode))->performMouseDown(setSelection, keyIndex);
+			{
+				auto editAction = dynamic_cast<SingleNoteAssign*>(editFunctionsTab->getTabContentComponent(editMode))->createEditAction(setSelection, keyIndex);
+				TerpstraSysExApplication::getApp().performUndoableAction(editAction);
 				break;
+			}
 			case noteEditMode::IsomorphicMassAssignMode:
-				mappingChanged = dynamic_cast<IsomorphicMassAssign*>(editFunctionsTab->getTabContentComponent(editMode))->performMouseDown(setSelection, keyIndex);
+			{
+				bool mappingChanged = dynamic_cast<IsomorphicMassAssign*>(editFunctionsTab->getTabContentComponent(editMode))->performMouseDown(setSelection, keyIndex);
+				if (mappingChanged)
+				{
+					TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+
+					// Refresh key fields (all may be affected)
+					((MainContentComponent*)getParentComponent())->refreshKeyDataFields();
+				}
 				break;
+			}
 			default:
 				break;
 			}
@@ -225,18 +226,6 @@ void NoteEditArea::mouseDown (const juce::MouseEvent& e)
 		}
 	}
 
-	// Mark that there are changes
-	if (mappingChanged)
-	{
-		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-
-		// Refresh key fields (all may be affected)
-		// repaint();	That should be enough - but is not. apparently...XXX
-		refreshKeyFields();
-
-		((MainContentComponent*)getParentComponent())->refreshAllKeysOverview();
-	}
-
     //[/UserCode_mouseDown]
 }
 
@@ -325,6 +314,36 @@ void NoteEditArea::refreshKeyFields()
 	jassert(setSelection >= 0 && setSelection < NUMBEROFBOARDS);
 	setKeyFieldValues(((MainContentComponent*)getParentComponent())->getMappingInEdit().sets[setSelection]);
 }
+
+void NoteEditArea::resetOctaveSize(bool refreshAndResize)
+{
+	int boardSize = TerpstraSysExApplication::getApp().getOctaveBoardSize();
+
+	jassert(boardSize == 55 || boardSize == 56);
+
+	if (currentBoardSize != boardSize)
+	{
+		boardGeometry = TerpstraBoardGeometry();
+
+		for (int i = 0; i < 56; i++)
+			terpstraKeyFields[i] = nullptr;
+
+		for (int i = 0; i < boardSize; i++)
+		{
+			terpstraKeyFields[i].reset(new TerpstraKeyEdit());
+			addAndMakeVisible(terpstraKeyFields[i].get());
+			terpstraKeyFields[i]->addMouseListener(this, true);
+		}
+
+		currentBoardSize = boardSize;
+
+		if (refreshAndResize)
+		{
+			refreshKeyFields();
+			resized();
+		}
+	}
+}
 //[/MiscUserCode]
 
 
@@ -338,7 +357,8 @@ void NoteEditArea::refreshKeyFields()
 BEGIN_JUCER_METADATA
 
 <JUCER_COMPONENT documentType="Component" className="NoteEditArea" componentName=""
-                 parentClasses="public Component, public ChangeListener" constructorParams=""
+                 parentClasses="public Component, public ChangeListener, public 
+                 LumatoneController::FirmwareListener" constructorParams=""
                  variableInitialisers="currentSingleKeySelection(-1)" snapPixels="8"
                  snapActive="1" snapShown="1" overlayOpacity="0.330" fixedSize="0"
                  initialWidth="760" initialHeight="470">
diff --git a/Source/NoteEditArea.h b/Source/NoteEditArea.h
index faa4b4f5..c07e950e 100644
--- a/Source/NoteEditArea.h
+++ b/Source/NoteEditArea.h
@@ -80,6 +80,8 @@ class NoteEditArea  : public Component,
     // Helper method for aligning the Octave Section TabbedButtonBar
     void setControlsTopLeftPosition(int controlsAreaX, int controlsAreaY);
 
+    void resetOctaveSize(bool refreshAndResize=true);
+
     //[/UserMethods]
 
     void paint (juce::Graphics& g) override;
@@ -95,6 +97,7 @@ class NoteEditArea  : public Component,
         IsomorphicMassAssignMode = 1
     };
 
+    int currentBoardSize = 0;
 	bool showIsomorphicMassAssign = false;
 
 	// Selector for octave boards
diff --git a/Source/PedalSensitivityDlg.cpp b/Source/PedalSensitivityDlg.cpp
index 7d42f33a..d94e8f93 100644
--- a/Source/PedalSensitivityDlg.cpp
+++ b/Source/PedalSensitivityDlg.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.5
+  Created with Projucer version: 6.0.8
 
   ------------------------------------------------------------------------------
 
@@ -33,35 +33,58 @@ PedalSensitivityDlg::PedalSensitivityDlg ()
     //[Constructor_pre] You can add your own custom stuff here..
     //[/Constructor_pre]
 
-    labelExprContrSensivity.reset(new juce::Label("new label", translate("Sensitivity")));
-    addAndMakeVisible (labelExprContrSensivity.get());
-    labelExprContrSensivity->setJustificationType(Justification::centred);
-    labelExprContrSensivity->setBounds (6, 35, 64, 24);
+    labelExprContrSensitivity.reset (new juce::Label ("new label",
+                                                      TRANS("Sensitivity:")));
+    addAndMakeVisible (labelExprContrSensitivity.get());
+    labelExprContrSensitivity->setFont (juce::Font (15.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
+    labelExprContrSensitivity->setJustificationType (juce::Justification::centredLeft);
+    labelExprContrSensitivity->setEditable (false, false, false);
+    labelExprContrSensitivity->setColour (juce::TextEditor::textColourId, juce::Colours::black);
+    labelExprContrSensitivity->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
 
-    btnInvertFootCtrl.reset (new juce::ToggleButton ("btnInvertFootCtrl"));
-    addAndMakeVisible (btnInvertFootCtrl.get());
-    btnInvertFootCtrl->setButtonText (translate("Invert Pedal"));
-    btnInvertFootCtrl->addListener (this);
+    labelExprContrSensitivity->setBounds (6, 35, 64, 24);
 
-    btnInvertFootCtrl->setBounds (6, 67, 162, 24);
+    btnInvertExpression.reset (new juce::ToggleButton ("btnInvertExpression"));
+    addAndMakeVisible (btnInvertExpression.get());
+    btnInvertExpression->setButtonText (TRANS("Invert Expression"));
+    btnInvertExpression->addListener (this);
 
-    labelEXpressionPedalTitle.reset (new juce::Label ("labelEXpressionPedalTitle", translate("Expression Pedal")));
-    addAndMakeVisible (labelEXpressionPedalTitle.get());
-    labelEXpressionPedalTitle->setBounds (6, 3, 104, 24);
+    btnInvertExpression->setBounds (8, 96, 162, 24);
 
-    sldExprCtrlSensivity.reset (new juce::Slider ("sldExprCtrlSensivity"));
-    addAndMakeVisible (sldExprCtrlSensivity.get());
-    sldExprCtrlSensivity->setRange (0, 127, 1);
-    sldExprCtrlSensivity->setSliderStyle (juce::Slider::RotaryHorizontalVerticalDrag);
-    sldExprCtrlSensivity->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 60, 20);
-    sldExprCtrlSensivity->addListener (this);
+    labelPedalTitle.reset (new juce::Label ("labelPedalTitle",
+                                            TRANS("Pedal Settings")));
+    addAndMakeVisible (labelPedalTitle.get());
+    labelPedalTitle->setFont (juce::Font (18.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
+    labelPedalTitle->setJustificationType (juce::Justification::centredLeft);
+    labelPedalTitle->setEditable (false, false, false);
+    labelPedalTitle->setColour (juce::Label::textColourId, juce::Colour (0xff61acc8));
+    labelPedalTitle->setColour (juce::TextEditor::textColourId, juce::Colours::black);
+    labelPedalTitle->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
 
-    sldExprCtrlSensivity->setBounds (77, 12, 160, 72);
+    labelPedalTitle->setBounds (6, 3, 104, 24);
+
+    sldExprCtrlSensitivity.reset (new juce::Slider ("sldExprCtrlSensitivity"));
+    addAndMakeVisible (sldExprCtrlSensitivity.get());
+    sldExprCtrlSensitivity->setRange (0, 127, 1);
+    sldExprCtrlSensitivity->setSliderStyle (juce::Slider::RotaryHorizontalVerticalDrag);
+    sldExprCtrlSensitivity->setTextBoxStyle (juce::Slider::TextBoxLeft, false, 60, 20);
+    sldExprCtrlSensitivity->addListener (this);
+
+    sldExprCtrlSensitivity->setBounds (77, 12, 160, 72);
+
+    btnInvertSustain.reset (new juce::ToggleButton ("btnInvertSustain"));
+    addAndMakeVisible (btnInvertSustain.get());
+    btnInvertSustain->setButtonText (TRANS("Invert Sustain"));
+    btnInvertSustain->addListener (this);
+
+    btnInvertSustain->setBounds (8, 72, 150, 24);
 
 
     //[UserPreSize]
-    labelEXpressionPedalTitle->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
-    labelExprContrSensivity->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+    labelPedalTitle->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::UniviaProBold));
+    labelExprContrSensitivity->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
+
+    TerpstraSysExApplication::getApp().getLumatoneController().addFirmwareListener(this);
     //[/UserPreSize]
 
     setSize (134, 96);
@@ -76,10 +99,11 @@ PedalSensitivityDlg::~PedalSensitivityDlg()
     //[Destructor_pre]. You can add your own custom destruction code here..
     //[/Destructor_pre]
 
-    labelExprContrSensivity = nullptr;
-    btnInvertFootCtrl = nullptr;
-    labelEXpressionPedalTitle = nullptr;
-    sldExprCtrlSensivity = nullptr;
+    labelExprContrSensitivity = nullptr;
+    btnInvertExpression = nullptr;
+    labelPedalTitle = nullptr;
+    sldExprCtrlSensitivity = nullptr;
+    btnInvertSustain = nullptr;
 
 
     //[Destructor]. You can add your own custom destruction code here..
@@ -109,17 +133,18 @@ void PedalSensitivityDlg::resized()
 
     roundedCornerSize = round(getParentHeight() * ROUNDEDCORNERTOAPPHEIGHT);
 
-    resizeLabelWithHeight(labelEXpressionPedalTitle.get(), roundToInt(getHeight() * SETTINGSLABELHEIGHT));
-    labelEXpressionPedalTitle->setTopLeftPosition(roundToInt(getWidth() * SETTINGSLABELMARGINWIDTH), 0);
+    resizeLabelWithHeight(labelPedalTitle.get(), roundToInt(getHeight() * SETTINGSLABELHEIGHT));
+    labelPedalTitle->setTopLeftPosition(roundToInt(getWidth() * SETTINGSLABELMARGINWIDTH), 0);
 
     int marginX = roundToInt(getParentWidth() * SETTINGSCONTROLMARGINTOAPPWIDTH);
     int buttonHeight = roundToInt(h * SETTINGSTOGGLEHEIGHTSCALAR);
-    btnInvertFootCtrl->setBounds(marginX, proportionOfHeight(0.3f), w, buttonHeight);
+    btnInvertExpression->setBounds(marginX, proportionOfHeight(0.3f), w, buttonHeight);
+    btnInvertSustain->setBounds(marginX, proportionOfHeight(0.5), w, buttonHeight);
 
-    sldExprCtrlSensivity->setBounds(getLocalBounds().toFloat().getProportion(sliderBoundsProps).toNearestInt());
+    sldExprCtrlSensitivity->setBounds(getLocalBounds().toFloat().getProportion(sliderBoundsProps).toNearestInt());
 
-    resizeLabelWithHeight(labelExprContrSensivity.get(), buttonHeight * 1.25f);
-    labelExprContrSensivity->setCentrePosition(sldExprCtrlSensivity->getBounds().getCentreX(), btnInvertFootCtrl->getBounds().getCentreY());
+    resizeLabelWithHeight(labelExprContrSensitivity.get(), buttonHeight * 1.2f, 1.0f, "");
+    labelExprContrSensitivity->setCentrePosition(sldExprCtrlSensitivity->getBounds().getCentreX(), btnInvertExpression->getBounds().getCentreY());
     //[/UserResized]
 }
 
@@ -128,13 +153,23 @@ void PedalSensitivityDlg::buttonClicked (juce::Button* buttonThatWasClicked)
     //[UserbuttonClicked_Pre]
     //[/UserbuttonClicked_Pre]
 
-    if (buttonThatWasClicked == btnInvertFootCtrl.get())
+    if (buttonThatWasClicked == btnInvertExpression.get())
     {
-        //[UserButtonCode_btnInvertFootCtrl] -- add your button handler code here..
-		((MainContentComponent*)getParentComponent())->getMappingInEdit().invertFootController = btnInvertFootCtrl->getToggleState();
-		TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-		TerpstraSysExApplication::getApp().getMidiDriver().sendInvertFootController(btnInvertFootCtrl->getToggleState());
-        //[/UserButtonCode_btnInvertFootCtrl]
+        //[UserButtonCode_btnInvertExpression] -- add your button handler code here..
+        bool invert = btnInvertExpression->getToggleState();
+        ((MainContentComponent*)getParentComponent())->getMappingInEdit().invertExpression = invert;
+        TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+        TerpstraSysExApplication::getApp().getLumatoneController().sendInvertFootController(invert);
+        //[/UserButtonCode_btnInvertExpression]
+    }
+    else if (buttonThatWasClicked == btnInvertSustain.get())
+    {
+        //[UserButtonCode_btnInvertSustain] -- add your button handler code here..
+        bool invert = btnInvertSustain->getToggleState();
+        ((MainContentComponent*)getParentComponent())->getMappingInEdit().invertSustain = invert;
+        TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+        TerpstraSysExApplication::getApp().getLumatoneController().invertSustainPedal(invert);
+        //[/UserButtonCode_btnInvertSustain]
     }
 
     //[UserbuttonClicked_Post]
@@ -146,27 +181,10 @@ void PedalSensitivityDlg::sliderValueChanged (juce::Slider* sliderThatWasMoved)
     //[UsersliderValueChanged_Pre]
     //[/UsersliderValueChanged_Pre]
 
-    if (sliderThatWasMoved == sldExprCtrlSensivity.get())
+    if (sliderThatWasMoved == sldExprCtrlSensitivity.get())
     {
-        //[UserSliderCode_sldExprCtrlSensivity] -- add your slider handling code here..
-        int newSensitvity = sldExprCtrlSensivity->getValue();
-        // ToDo value checking: encapsulate in keyboard data structure?
-        if (newSensitvity < 0)
-        {
-            newSensitvity = 0;
-            sldExprCtrlSensivity->setValue(newSensitvity);
-        }
-
-        if (newSensitvity > 0x7f)
-        {
-            newSensitvity = 0x7f;
-            sldExprCtrlSensivity->setValue(newSensitvity);
-        }
-
-        ((MainContentComponent*)getParentComponent())->getMappingInEdit().expressionControllerSensivity = newSensitvity;
-        TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-        TerpstraSysExApplication::getApp().getMidiDriver().sendExpressionPedalSensivity(newSensitvity);
-        //[/UserSliderCode_sldExprCtrlSensivity]
+        //[UserSliderCode_sldExprCtrlSensitivity] -- add your slider handling code here..
+        //[/UserSliderCode_sldExprCtrlSensitivity]
     }
 
     //[UsersliderValueChanged_Post]
@@ -210,9 +228,8 @@ void PedalSensitivityDlg::lookAndFeelChanged()
     auto newLookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
     if (newLookAndFeel)
     {
-		newLookAndFeel->setupToggleButton(*btnInvertFootCtrl);
-        labelEXpressionPedalTitle->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
-          labelExprContrSensivity->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::DescriptionText));
+        labelPedalTitle->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::LabelBlue));
+        labelExprContrSensitivity->setColour(Label::ColourIds::textColourId, newLookAndFeel->findColour(LumatoneEditorColourIDs::DescriptionText));
     }
 }
 
@@ -220,8 +237,23 @@ void PedalSensitivityDlg::loadFromMapping()
 {
 	auto mappingInEdit = ((MainContentComponent*)getParentComponent())->getMappingInEdit();
 
-	btnInvertFootCtrl->setToggleState(mappingInEdit.invertFootController, juce::NotificationType::dontSendNotification);
-	sldExprCtrlSensivity->setValue(mappingInEdit.expressionControllerSensivity, juce::NotificationType::dontSendNotification);
+	btnInvertExpression->setToggleState(mappingInEdit.invertExpression, juce::NotificationType::dontSendNotification);
+    btnInvertSustain->setToggleState(mappingInEdit.invertSustain, juce::NotificationType::dontSendNotification);
+	sldExprCtrlSensitivity->setValue(mappingInEdit.expressionControllerSensivity, juce::NotificationType::dontSendNotification);
+}
+
+void PedalSensitivityDlg::firmwareRevisionReceived(FirmwareVersion version)
+{
+    FirmwareSupport firmwareSupport;
+
+    if (firmwareSupport.versionAcknowledgesCommand(version, INVERT_SUSTAIN_PEDAL))
+    {
+        btnInvertSustain->setVisible(true);
+    }
+    else
+    {
+        btnInvertSustain->setVisible(false);
+    }
 }
 
 //[/MiscUserCode]
@@ -237,29 +269,33 @@ void PedalSensitivityDlg::loadFromMapping()
 BEGIN_JUCER_METADATA
 
 <JUCER_COMPONENT documentType="Component" className="PedalSensitivityDlg" componentName=""
-                 parentClasses="public juce::Component" constructorParams="" variableInitialisers=""
-                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
-                 fixedSize="0" initialWidth="134" initialHeight="96">
+                 parentClasses="public juce::Component, public LumatoneController::FirmwareListener"
+                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
+                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="134"
+                 initialHeight="96">
   <BACKGROUND backgroundColour="0"/>
-  <LABEL name="new label" id="22d529ada4ac7738" memberName="labelExprContrSensivity"
+  <LABEL name="new label" id="22d529ada4ac7738" memberName="labelExprContrSensitivity"
          virtualName="" explicitFocusOrder="0" pos="6 35 64 24" edTextCol="ff000000"
-         edBkgCol="0" labelText="Sensivity:" editableSingleClick="0" editableDoubleClick="0"
-         focusDiscardsChanges="0" fontname="Default font" fontsize="15.0"
-         kerning="0.0" bold="0" italic="0" justification="33"/>
-  <TOGGLEBUTTON name="btnInvertFootCtrl" id="ef6e332d2b99beda" memberName="btnInvertFootCtrl"
-                virtualName="" explicitFocusOrder="0" pos="6 67 162 24" buttonText="Invert Sustain Pedal"
+         edBkgCol="0" labelText="Sensitivity:" editableSingleClick="0"
+         editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
+         fontsize="15.0" kerning="0.0" bold="0" italic="0" justification="33"/>
+  <TOGGLEBUTTON name="btnInvertExpression" id="ef6e332d2b99beda" memberName="btnInvertExpression"
+                virtualName="" explicitFocusOrder="0" pos="8 96 162 24" buttonText="Invert Expression"
                 connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
-  <LABEL name="labelEXpressionPedalTitle" id="afc0b85c8e03b3d6" memberName="labelEXpressionPedalTitle"
+  <LABEL name="labelPedalTitle" id="afc0b85c8e03b3d6" memberName="labelPedalTitle"
          virtualName="" explicitFocusOrder="0" pos="6 3 104 24" textCol="ff61acc8"
-         edTextCol="ff000000" edBkgCol="0" labelText="Expression Pedal"
+         edTextCol="ff000000" edBkgCol="0" labelText="Pedal Settings"
          editableSingleClick="0" editableDoubleClick="0" focusDiscardsChanges="0"
          fontname="Default font" fontsize="18.0" kerning="0.0" bold="0"
          italic="0" justification="33"/>
-  <SLIDER name="sldExprCtrlSensivity" id="7f6911c9ec82fd65" memberName="sldExprCtrlSensivity"
+  <SLIDER name="sldExprCtrlSensitivity" id="7f6911c9ec82fd65" memberName="sldExprCtrlSensitivity"
           virtualName="" explicitFocusOrder="0" pos="77 12 160 72" min="0.0"
           max="127.0" int="1.0" style="RotaryHorizontalVerticalDrag" textBoxPos="TextBoxLeft"
           textBoxEditable="1" textBoxWidth="60" textBoxHeight="20" skewFactor="1.0"
           needsCallback="1"/>
+  <TOGGLEBUTTON name="btnInvertSustain" id="59dfe985e5dfbdca" memberName="btnInvertSustain"
+                virtualName="" explicitFocusOrder="0" pos="8 72 150 24" buttonText="Invert Sustain"
+                connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
 </JUCER_COMPONENT>
 
 END_JUCER_METADATA
diff --git a/Source/PedalSensitivityDlg.h b/Source/PedalSensitivityDlg.h
index 55582000..784f5826 100644
--- a/Source/PedalSensitivityDlg.h
+++ b/Source/PedalSensitivityDlg.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.5
+  Created with Projucer version: 6.0.8
 
   ------------------------------------------------------------------------------
 
@@ -36,6 +36,7 @@
                                                                     //[/Comments]
 */
 class PedalSensitivityDlg  : public juce::Component,
+                             public LumatoneController::FirmwareListener,
                              public juce::Button::Listener,
                              public juce::Slider::Listener
 {
@@ -50,6 +51,10 @@ class PedalSensitivityDlg  : public juce::Component,
 	void loadFromMapping();
 
 	void lookAndFeelChanged() override;
+
+    // LumatoneController::FirmwareListener implementation
+    void firmwareRevisionReceived(FirmwareVersion version) override;
+
     //[/UserMethods]
 
     void paint (juce::Graphics& g) override;
@@ -70,10 +75,11 @@ class PedalSensitivityDlg  : public juce::Component,
     //[/UserVariables]
 
     //==============================================================================
-    std::unique_ptr<juce::Label> labelExprContrSensivity;
-    std::unique_ptr<juce::ToggleButton> btnInvertFootCtrl;
-    std::unique_ptr<juce::Label> labelEXpressionPedalTitle;
-    std::unique_ptr<juce::Slider> sldExprCtrlSensivity;
+    std::unique_ptr<juce::Label> labelExprContrSensitivity;
+    std::unique_ptr<juce::ToggleButton> btnInvertExpression;
+    std::unique_ptr<juce::Label> labelPedalTitle;
+    std::unique_ptr<juce::Slider> sldExprCtrlSensitivity;
+    std::unique_ptr<juce::ToggleButton> btnInvertSustain;
 
 
     //==============================================================================
diff --git a/Source/CalibrationDlg.cpp b/Source/Settings/CalibrationDlg.cpp
similarity index 90%
rename from Source/CalibrationDlg.cpp
rename to Source/Settings/CalibrationDlg.cpp
index 8cae627c..aed8eb4d 100644
--- a/Source/CalibrationDlg.cpp
+++ b/Source/Settings/CalibrationDlg.cpp
@@ -1,288 +1,304 @@
-/*
-  ==============================================================================
-
-  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: 6.0.5
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-//[Headers] You can add your own extra header files here...
-#include "ViewConstants.h"
-#include "Main.h"
-//[/Headers]
-
-#include "CalibrationDlg.h"
-
-
-//[MiscUserDefs] You can add your own user definitions and misc code here...
-//[/MiscUserDefs]
-
-//==============================================================================
-CalibrationDlg::CalibrationDlg ()
-{
-    //[Constructor_pre] You can add your own custom stuff here..
-	instructionsFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic);
-    //[/Constructor_pre]
-
-    btnStart.reset (new juce::TextButton ("btnStart"));
-    addAndMakeVisible (btnStart.get());
-    btnStart->setButtonText (TRANS("Start calibration"));
-    btnStart->addListener (this);
-
-    btnStart->setBounds (16, 176, 144, 24);
-
-    btnStop.reset (new juce::TextButton ("btnStop"));
-    addAndMakeVisible (btnStop.get());
-    btnStop->setButtonText (TRANS("End calibration"));
-    btnStop->addListener (this);
-
-    btnStop->setBounds (304, 176, 144, 24);
-
-
-    //[UserPreSize]
-
-	// Calibration type selector
-	calibrationSelectorTab.reset(new TabbedButtonBar(TabbedButtonBar::Orientation::TabsAtTop));
-	addAndMakeVisible(calibrationSelectorTab.get());
-
-	calibrationSelectorTab->addTab(translate("Keys"), juce::Colours::lightgrey, 1);
-	calibrationSelectorTab->addTab(translate("Aftertouch"), juce::Colours::lightgrey, 2);
-	calibrationSelectorTab->addTab(translate("Modulation Wheel"), juce::Colours::lightgrey, 3);
-
-	calibrationSelectorTab->addChangeListener(this);
-
-    //[/UserPreSize]
-
-    setSize (524, 212);
-
-
-    //[Constructor] You can add your own custom stuff here..
-	calibrationSelectorTab->setCurrentTabIndex(0);
-	// Force calling the callback routine
-	changeListenerCallback(calibrationSelectorTab.get());
-    //[/Constructor]
-}
-
-CalibrationDlg::~CalibrationDlg()
-{
-    //[Destructor_pre]. You can add your own custom destruction code here..
-    //[/Destructor_pre]
-
-    btnStart = nullptr;
-    btnStop = nullptr;
-
-
-    //[Destructor]. You can add your own custom destruction code here..
-	calibrationSelectorTab = nullptr;
-    //[/Destructor]
-}
-
-//==============================================================================
-void CalibrationDlg::paint (juce::Graphics& g)
-{
-    //[UserPrePaint] Add your own custom painting code here..
-    //[/UserPrePaint]
-
-    g.fillAll (juce::Colour (0xff323e44));
-
-    //[UserPaint] Add your own custom painting code here..
-	g.fillAll(findColour(ResizableWindow::ColourIds::backgroundColourId));
-
-	g.setColour(findColour(DocumentWindow::ColourIds::textColourId));
-	g.setFont(instructionsFont);
-	g.drawFittedText(instructionText, instructionsBounds, Justification::centred, 2, 1.0f);
-    //[/UserPaint]
-}
-
-void CalibrationDlg::resized()
-{
-    //[UserPreResize] Add your own custom resize code here..
-    //[/UserPreResize]
-
-    //[UserResized] Add your own custom resize handling here..
-	calibrationSelectorTab->setBounds(0, 0, getWidth() - generalRim, OCTAVEBOARDTABHEIGHT);
-
-	instructionsBounds.setBounds(
-		generalRim,
-		calibrationSelectorTab->getBottom() + generalRim,
-		getWidth() - 2 * generalRim,
-		btnStart->getY() - calibrationSelectorTab->getBottom() - 2 * generalRim);
-	instructionsFont.setHeight(instructionsBounds.getHeight() * fontHeightInBounds);
-
-	int buttonWidth = proportionOfWidth(0.3f);
-	int buttonHeight = proportionOfHeight(0.125f);
-	btnStart->setSize(buttonWidth, buttonHeight);
-	btnStart->setTopLeftPosition(generalRim, getHeight() - generalRim - buttonHeight);
-
-	btnStop->setBounds(btnStart->getBounds().withX(getWidth() - generalRim - buttonWidth));
-
-    //[/UserResized]
-}
-
-void CalibrationDlg::buttonClicked (juce::Button* buttonThatWasClicked)
-{
-    //[UserbuttonClicked_Pre]
-    //[/UserbuttonClicked_Pre]
-
-    if (buttonThatWasClicked == btnStart.get())
-    {
-        //[UserButtonCode_btnStart] -- add your button handler code here..
-
-		// Command depending on tab selection
-		auto tabSelection = calibrationSelectorTab->getCurrentTabIndex();
-		switch (tabSelection)
-		{
-		case calibrateKeys:
-			TerpstraSysExApplication::getApp().getMidiDriver().sendCalibrateKeys();
-			break;
-
-		case calibrateAftertouch:
-			TerpstraSysExApplication::getApp().getMidiDriver().sendCalibrateAfterTouch();
-			break;
-
-		case calibrateModulationWheel:
-			TerpstraSysExApplication::getApp().getMidiDriver().sendCalibratePitchModWheel(true);
-			break;
-
-		default:
-			jassertfalse;
-			break;
-		}
-
-        //[/UserButtonCode_btnStart]
-    }
-    else if (buttonThatWasClicked == btnStop.get())
-    {
-        //[UserButtonCode_btnStop] -- add your button handler code here..
-
-		// Command depending on tab selection
-		auto tabSelection = calibrationSelectorTab->getCurrentTabIndex();
-		switch (tabSelection)
-		{
-		case calibrateKeys:
-		case calibrateAftertouch:
-			// No function for the stop button in this mode. Whe should never get here.
-			jassertfalse;
-			break;
-		case calibrateModulationWheel:
-			TerpstraSysExApplication::getApp().getMidiDriver().sendCalibratePitchModWheel(false);
-			break;
-		default:
-			jassertfalse;
-			break;
-		}
-
-        //[/UserButtonCode_btnStop]
-    }
-
-    //[UserbuttonClicked_Post]
-    //[/UserbuttonClicked_Post]
-}
-
-void CalibrationDlg::lookAndFeelChanged()
-{
-    //[UserCode_lookAndFeelChanged] -- Add your code here...
-	auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
-	if (lookAndFeel)
-	{
-		setColour(ResizableWindow::ColourIds::backgroundColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::LightBackground));
-		setColour(DocumentWindow::ColourIds::textColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::InactiveText));
-		lookAndFeel->setupTextButton(*btnStart);
-		lookAndFeel->setupTextButton(*btnStop);
-	}
-    //[/UserCode_lookAndFeelChanged]
-}
-
-
-
-//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
-
-void CalibrationDlg::changeListenerCallback(ChangeBroadcaster *source)
-{
-	if (source == calibrationSelectorTab.get())
-	{
-		// Instructions depending on tab selection
-		auto tabSelection = calibrationSelectorTab->getCurrentTabIndex();
-		switch (tabSelection)
-		{
-		case calibrateKeys:
-			instructionText.clear();
-			instructionText << translate("Click \'Start calibration\' to let the keyboard operate in key calibration mode.")
-				<< newLine
-				<< translate("To return to normal operating state, the five submodule boards must exit out calibration mode by pressing their corresponding macro buttons to save or cancel calibration.");
-			btnStop->setVisible(false);
-			repaint();
-			break;
-
-		case calibrateAftertouch:
-			instructionText.clear();
-			instructionText << translate("Click \'Start calibration\'to let the keyboard operate in aftertouch calibration mode.")
-				<< newLine
-				<< translate("To return to normal operating state, the five submodule boards must exit out calibration mode by pressing their corresponding macro buttons to save or cancel calibration.");
-			btnStop->setVisible(false);
-			repaint();
-			break;
-
-		case calibrateModulationWheel:
-			instructionText.clear();
-			instructionText << translate("Click \'Start calibration\' to start calibrating, then turn the wheels to their extremities to update the wheel range values.")
-				<< newLine
-				<< translate("Click \'End calibration\' to stop.");
-			btnStop->setVisible(true);
-			repaint();
-			break;
-		default:
-			jassertfalse;
-			break;
-		}
-	}
-}
-
-//[/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="CalibrationDlg" componentName=""
-                 parentClasses="public juce::Component, public ChangeListener"
-                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
-                 snapShown="1" overlayOpacity="0.330" fixedSize="1" initialWidth="524"
-                 initialHeight="212">
-  <METHODS>
-    <METHOD name="lookAndFeelChanged()"/>
-  </METHODS>
-  <BACKGROUND backgroundColour="ff323e44"/>
-  <TEXTBUTTON name="btnStart" id="b61e736f368865ec" memberName="btnStart" virtualName=""
-              explicitFocusOrder="0" pos="16 176 144 24" buttonText="Start calibration"
-              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
-  <TEXTBUTTON name="btnStop" id="4f14fb4a331cad95" memberName="btnStop" virtualName=""
-              explicitFocusOrder="0" pos="304 176 144 24" buttonText="End calibration"
-              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
-</JUCER_COMPONENT>
-
-END_JUCER_METADATA
-*/
-#endif
-
-
-//[EndFile] You can add extra defines here...
-//[/EndFile]
-
+/*
+  ==============================================================================
+
+  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: 6.0.5
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+//[Headers] You can add your own extra header files here...
+#include "../ViewConstants.h"
+#include "../Main.h"
+//[/Headers]
+
+#include "CalibrationDlg.h"
+
+
+//[MiscUserDefs] You can add your own user definitions and misc code here...
+//[/MiscUserDefs]
+
+//==============================================================================
+CalibrationDlg::CalibrationDlg ()
+{
+    //[Constructor_pre] You can add your own custom stuff here..
+	instructionsFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic);
+    //[/Constructor_pre]
+
+    btnStart.reset (new juce::TextButton ("btnStart"));
+    addAndMakeVisible (btnStart.get());
+    btnStart->setButtonText (TRANS("Start calibration"));
+    btnStart->addListener (this);
+
+    btnStart->setBounds (16, 176, 144, 24);
+
+    btnStop.reset (new juce::TextButton ("btnStop"));
+    addAndMakeVisible (btnStop.get());
+    btnStop->setButtonText (TRANS("End calibration"));
+    btnStop->addListener (this);
+
+    btnStop->setBounds (304, 176, 144, 24);
+
+
+    //[UserPreSize]
+
+	updateCalibrationStatus();
+
+	// Calibration type selector
+	calibrationSelectorTab.reset(new TabbedButtonBar(TabbedButtonBar::Orientation::TabsAtTop));
+	addAndMakeVisible(calibrationSelectorTab.get());
+
+	calibrationSelectorTab->addTab(translate("Keys"), juce::Colours::lightgrey, 1);
+	calibrationSelectorTab->addTab(translate("Aftertouch"), juce::Colours::lightgrey, 2);
+	calibrationSelectorTab->addTab(translate("Modulation Wheel"), juce::Colours::lightgrey, 3);
+
+	calibrationSelectorTab->addChangeListener(this);
+
+    //[/UserPreSize]
+
+    setSize (524, 212);
+
+
+    //[Constructor] You can add your own custom stuff here..
+	calibrationSelectorTab->setCurrentTabIndex(0);
+	// Force calling the callback routine
+	changeListenerCallback(calibrationSelectorTab.get());
+    //[/Constructor]
+}
+
+CalibrationDlg::~CalibrationDlg()
+{
+    //[Destructor_pre]. You can add your own custom destruction code here..
+    //[/Destructor_pre]
+
+    btnStart = nullptr;
+    btnStop = nullptr;
+
+
+    //[Destructor]. You can add your own custom destruction code here..
+	calibrationSelectorTab = nullptr;
+    //[/Destructor]
+}
+
+//==============================================================================
+void CalibrationDlg::paint (juce::Graphics& g)
+{
+    //[UserPrePaint] Add your own custom painting code here..
+    //[/UserPrePaint]
+
+    g.fillAll (juce::Colour (0xff323e44));
+
+    //[UserPaint] Add your own custom painting code here..
+	g.fillAll(findColour(ResizableWindow::ColourIds::backgroundColourId));
+
+	g.setColour(findColour(DocumentWindow::ColourIds::textColourId));
+	g.setFont(instructionsFont);
+	g.drawFittedText(instructionText, instructionsBounds, Justification::centred, 2, 1.0f);
+    //[/UserPaint]
+}
+
+void CalibrationDlg::resized()
+{
+    //[UserPreResize] Add your own custom resize code here..
+    //[/UserPreResize]
+
+    //[UserResized] Add your own custom resize handling here..
+	calibrationSelectorTab->setBounds(0, 0, getWidth() - generalRim, OCTAVEBOARDTABHEIGHT);
+
+	instructionsBounds.setBounds(
+		generalRim,
+		calibrationSelectorTab->getBottom() + generalRim,
+		getWidth() - 2 * generalRim,
+		btnStart->getY() - calibrationSelectorTab->getBottom() - 2 * generalRim);
+	instructionsFont.setHeight(instructionsBounds.getHeight() * fontHeightInBounds);
+
+	int buttonWidth = proportionOfWidth(0.3f);
+	int buttonHeight = proportionOfHeight(0.125f);
+	btnStart->setSize(buttonWidth, buttonHeight);
+	btnStart->setTopLeftPosition(generalRim, getHeight() - generalRim - buttonHeight);
+
+	btnStop->setBounds(btnStart->getBounds().withX(getWidth() - generalRim - buttonWidth));
+
+    //[/UserResized]
+}
+
+void CalibrationDlg::buttonClicked (juce::Button* buttonThatWasClicked)
+{
+    //[UserbuttonClicked_Pre]
+    //[/UserbuttonClicked_Pre]
+
+    if (buttonThatWasClicked == btnStart.get())
+    {
+        //[UserButtonCode_btnStart] -- add your button handler code here..
+
+		// Command depending on tab selection
+		auto tabSelection = calibrationSelectorTab->getCurrentTabIndex();
+		switch (tabSelection)
+		{
+		case calibrateKeys:
+			TerpstraSysExApplication::getApp().getLumatoneController().startCalibrateKeys();
+			break;
+
+		case calibrateAftertouch:
+			TerpstraSysExApplication::getApp().getLumatoneController().startCalibrateAftertouch();
+			break;
+
+		case calibrateModulationWheel:
+			TerpstraSysExApplication::getApp().getLumatoneController().setCalibratePitchModWheel(true);
+			
+			// Todo - wait for ack
+			TerpstraSysExApplication::getApp().setCalibrationMode(true);
+			updateCalibrationStatus();
+			break;
+
+		default:
+			jassertfalse;
+			break;
+		}
+
+        //[/UserButtonCode_btnStart]
+    }
+    else if (buttonThatWasClicked == btnStop.get())
+    {
+        //[UserButtonCode_btnStop] -- add your button handler code here..
+
+		// Command depending on tab selection
+		auto tabSelection = calibrationSelectorTab->getCurrentTabIndex();
+		switch (tabSelection)
+		{
+		case calibrateKeys:
+		case calibrateAftertouch:
+			// No function for the stop button in this mode. Whe should never get here.
+			jassertfalse;
+			break;
+		case calibrateModulationWheel:
+			TerpstraSysExApplication::getApp().getLumatoneController().setCalibratePitchModWheel(false);
+			// Todo - wait for ack
+			TerpstraSysExApplication::getApp().setCalibrationMode(false);
+			updateCalibrationStatus();
+			break;
+		default:
+			jassertfalse;
+			break;
+		}
+
+        //[/UserButtonCode_btnStop]
+    }
+
+    //[UserbuttonClicked_Post]
+    //[/UserbuttonClicked_Post]
+}
+
+void CalibrationDlg::lookAndFeelChanged()
+{
+    //[UserCode_lookAndFeelChanged] -- Add your code here...
+	auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
+	if (lookAndFeel)
+	{
+		setColour(ResizableWindow::ColourIds::backgroundColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::LightBackground));
+		setColour(DocumentWindow::ColourIds::textColourId, lookAndFeel->findColour(LumatoneEditorColourIDs::InactiveText));
+	}
+    //[/UserCode_lookAndFeelChanged]
+}
+
+
+
+//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
+
+void CalibrationDlg::changeListenerCallback(ChangeBroadcaster *source)
+{
+	if (source == calibrationSelectorTab.get())
+	{
+		btnStart->setEnabled(true);
+		// Instructions depending on tab selection
+		auto tabSelection = calibrationSelectorTab->getCurrentTabIndex();
+		switch (tabSelection)
+		{
+		case calibrateKeys:
+			instructionText.clear();
+			instructionText << translate("Click \'Start calibration\' to let the keyboard operate in key calibration mode.")
+				<< newLine
+				<< translate("To return to normal operating state, the five submodule boards must exit out calibration mode by pressing their corresponding macro buttons to save or cancel calibration.");
+			btnStop->setVisible(false);
+			repaint();
+			break;
+
+		case calibrateAftertouch:
+			instructionText.clear();
+			instructionText << translate("Click \'Start calibration\'to let the keyboard operate in aftertouch calibration mode.")
+				<< newLine
+				<< translate("To return to normal operating state, the five submodule boards must exit out calibration mode by pressing their corresponding macro buttons to save or cancel calibration.");
+			btnStop->setVisible(false);
+			repaint();
+			break;
+
+		case calibrateModulationWheel:
+			instructionText.clear();
+			instructionText << translate("Click \'Start calibration\' to start calibrating, then turn the wheels to their extremities to update the wheel range values.")
+				<< newLine
+				<< translate("Click \'End calibration\' to stop.");
+			btnStop->setVisible(true);
+			updateCalibrationStatus();
+			repaint();
+			break;
+		default:
+			jassertfalse;
+			break;
+		}
+	}
+}
+
+void CalibrationDlg::updateCalibrationStatus()
+{
+	bool inCalibration = TerpstraSysExApplication::getApp().getInCalibrationMode();
+	btnStart->setEnabled(!inCalibration);
+	btnStop->setEnabled(inCalibration);
+}
+
+//[/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="CalibrationDlg" componentName=""
+                 parentClasses="public juce::Component, public ChangeListener"
+                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
+                 snapShown="1" overlayOpacity="0.330" fixedSize="1" initialWidth="524"
+                 initialHeight="212">
+  <METHODS>
+    <METHOD name="lookAndFeelChanged()"/>
+  </METHODS>
+  <BACKGROUND backgroundColour="ff323e44"/>
+  <TEXTBUTTON name="btnStart" id="b61e736f368865ec" memberName="btnStart" virtualName=""
+              explicitFocusOrder="0" pos="16 176 144 24" buttonText="Start calibration"
+              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+  <TEXTBUTTON name="btnStop" id="4f14fb4a331cad95" memberName="btnStop" virtualName=""
+              explicitFocusOrder="0" pos="304 176 144 24" buttonText="End calibration"
+              connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+</JUCER_COMPONENT>
+
+END_JUCER_METADATA
+*/
+#endif
+
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
diff --git a/Source/CalibrationDlg.h b/Source/Settings/CalibrationDlg.h
similarity index 96%
rename from Source/CalibrationDlg.h
rename to Source/Settings/CalibrationDlg.h
index 75ede39e..2c42f9bd 100644
--- a/Source/CalibrationDlg.h
+++ b/Source/Settings/CalibrationDlg.h
@@ -1,92 +1,93 @@
-/*
-  ==============================================================================
-
-  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: 6.0.5
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-#pragma once
-
-//[Headers]     -- You can add your own extra header files here --
-#include <JuceHeader.h>
-//[/Headers]
-
-
-
-//==============================================================================
-/**
-                                                                    //[Comments]
-    An auto-generated component, created by the Projucer.
-
-    Describe your class and how it works here!
-                                                                    //[/Comments]
-*/
-class CalibrationDlg  : public juce::Component,
-                        public ChangeListener,
-                        public juce::Button::Listener
-{
-public:
-    //==============================================================================
-    CalibrationDlg ();
-    ~CalibrationDlg() override;
-
-    //==============================================================================
-    //[UserMethods]     -- You can add your own custom methods in this section.
-
-	// Implementation of ChangeListener
-	void changeListenerCallback(ChangeBroadcaster *source) override;
-
-    //[/UserMethods]
-
-    void paint (juce::Graphics& g) override;
-    void resized() override;
-    void buttonClicked (juce::Button* buttonThatWasClicked) override;
-    void lookAndFeelChanged() override;
-
-
-
-private:
-    //[UserVariables]   -- You can add your own custom variables in this section.
-	enum calibrationMode
-	{
-		calibrateKeys = 0,
-		calibrateAftertouch = 1,
-		calibrateModulationWheel
-	};
-
-	std::unique_ptr<TabbedButtonBar> calibrationSelectorTab;
-
-	String instructionText;
-
-	// Style Helpers
-	Rectangle<int> instructionsBounds;
-    Font instructionsFont;
-	const float fontHeightInBounds = 0.125f;
-	const int generalRim = 12;
-
-    //[/UserVariables]
-
-    //==============================================================================
-    std::unique_ptr<juce::TextButton> btnStart;
-    std::unique_ptr<juce::TextButton> btnStop;
-
-
-    //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CalibrationDlg)
-};
-
-//[EndFile] You can add extra defines here...
-//[/EndFile]
-
+/*
+  ==============================================================================
+
+  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: 6.0.5
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+#pragma once
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+//[/Headers]
+
+
+
+//==============================================================================
+/**
+                                                                    //[Comments]
+    An auto-generated component, created by the Projucer.
+
+    Describe your class and how it works here!
+                                                                    //[/Comments]
+*/
+class CalibrationDlg  : public juce::Component,
+                        public ChangeListener,
+                        public juce::Button::Listener
+{
+public:
+    //==============================================================================
+    CalibrationDlg ();
+    ~CalibrationDlg() override;
+
+    //==============================================================================
+    //[UserMethods]     -- You can add your own custom methods in this section.
+
+	// Implementation of ChangeListener
+	void changeListenerCallback(ChangeBroadcaster *source) override;
+
+    void updateCalibrationStatus();
+    //[/UserMethods]
+
+    void paint (juce::Graphics& g) override;
+    void resized() override;
+    void buttonClicked (juce::Button* buttonThatWasClicked) override;
+    void lookAndFeelChanged() override;
+
+
+
+private:
+    //[UserVariables]   -- You can add your own custom variables in this section.
+	enum calibrationMode
+	{
+		calibrateKeys = 0,
+		calibrateAftertouch = 1,
+		calibrateModulationWheel
+	};
+
+	std::unique_ptr<TabbedButtonBar> calibrationSelectorTab;
+
+	String instructionText;
+
+	// Style Helpers
+	Rectangle<int> instructionsBounds;
+    Font instructionsFont;
+	const float fontHeightInBounds = 0.125f;
+	const int generalRim = 12;
+
+    //[/UserVariables]
+
+    //==============================================================================
+    std::unique_ptr<juce::TextButton> btnStart;
+    std::unique_ptr<juce::TextButton> btnStop;
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CalibrationDlg)
+};
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
+
diff --git a/Source/Settings/FirmwareDlg.cpp b/Source/Settings/FirmwareDlg.cpp
new file mode 100644
index 00000000..38ef9573
--- /dev/null
+++ b/Source/Settings/FirmwareDlg.cpp
@@ -0,0 +1,169 @@
+/*
+  ==============================================================================
+
+    FirmwareDlg.cpp
+    Created: 5 Feb 2021 7:33:07pm
+    Author:  Vincenzo
+
+  ==============================================================================
+*/
+
+#include "FirmwareDlg.h"
+#include "../Main.h"
+
+FirmwareDlg::FirmwareDlg()
+{
+    //checkUpdateBtn.reset(new TextButton("checkUpdateBtn"));
+    //checkUpdateBtn->setButtonText("Check For Updates");
+    //checkUpdateBtn->addListener(this);
+    //addAndMakeVisible(checkUpdateBtn.get());
+
+    auto properties = TerpstraSysExApplication::getApp().getPropertiesFile();
+    File lastFirmwareLocation = properties->getValue("LastFirmwareBinPath", properties->getValue("UserDocumentsLocation", File::getSpecialLocation(File::SpecialLocationType::userDocumentsDirectory).getFullPathName()));
+
+    fileBrowser.reset(new PathBrowserComponent("Lumatone Firmware Update", lastFirmwareLocation));
+    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::backgroundColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
+    fileBrowser->getEditor()->setColour(TextEditor::ColourIds::textColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+    fileBrowser->getEditor()->getProperties().set(LumatoneEditorStyleIDs::connectedEdgeFlags, Button::ConnectedEdgeFlags::ConnectedOnRight);
+    fileBrowser->addListener(this);
+    addAndMakeVisible(fileBrowser.get());
+
+    doUpdateBtn.reset(new TextButton("checkUpdateBtn"));
+    doUpdateBtn->setButtonText(translate("Begin Update"));
+    doUpdateBtn->addListener(this);
+    addAndMakeVisible(doUpdateBtn.get());
+
+    infoBox.reset(new TextEditor("FirmwareUpdateInfoBox"));
+    infoBox->setMouseClickGrabsKeyboardFocus(false);
+    infoBox->setReadOnly(true);
+    infoBox->setMultiLine(true);
+    infoBox->insertTextAtCaret(translate("Select a firmware file and then click \"Begin Update\""));
+    infoBox->setColour(TextEditor::ColourIds::backgroundColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground));
+    infoBox->setColour(TextEditor::ColourIds::textColourId, TerpstraSysExApplication::getApp().getLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+    infoBox->setColour(ScrollBar::ColourIds::thumbColourId, Colour(0xff2d3135));
+    infoBox->getProperties().set(LumatoneEditorStyleIDs::connectedEdgeFlags, 15);
+    addAndMakeVisible(infoBox.get());
+
+    firmwareStatusLabel.reset(new Label("FirmwareVersionStatusLabel"));
+    addAndMakeVisible(firmwareStatusLabel.get());
+    updateFirmwareVersionLabel();
+
+    TerpstraSysExApplication::getApp().getLumatoneController().addFirmwareListener(this);
+
+    //if (!updateIsAvailable)
+    //{
+        //doUpdateBtn->setEnabled(false);
+    //}
+}
+
+FirmwareDlg::~FirmwareDlg()
+{
+    TerpstraSysExApplication::getApp().getLumatoneController().removeFirmwareListener(this);
+}
+
+void FirmwareDlg::paint(Graphics& g)
+{
+
+}
+
+void FirmwareDlg::resized()
+{
+    int margin = 12;
+    int doubleMargin = margin * 2;
+    int buttonWidth = proportionOfWidth(0.3f);
+    int buttonHeight = 30;
+
+    //checkUpdateBtn->setBounds(margin, margin, buttonWidth, buttonHeight);
+
+    doUpdateBtn->setBounds(getWidth() - margin - buttonWidth, margin, buttonWidth, buttonHeight);
+    fileBrowser->setBounds(margin, margin, doUpdateBtn->getX() - doubleMargin, buttonHeight);
+
+    firmwareStatusLabel->setBounds(margin, fileBrowser->getBottom() + margin, getWidth() - doubleMargin, buttonHeight / 2);
+
+    infoBox->setBounds(getLocalBounds().withTop(firmwareStatusLabel->getBottom()).reduced(margin));
+    infoBox->applyFontToAllText(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic));
+}
+
+void FirmwareDlg::buttonClicked(Button* btn)
+{
+    //if (btn == checkUpdateBtn.get())
+    //{
+    //    DBG("Version check requested");
+    //}
+    if (btn == doUpdateBtn.get())
+    {
+        if (TerpstraSysExApplication::getApp().getLumatoneController().getMidiInputIndex() < 0 || TerpstraSysExApplication::getApp().getLumatoneController().getMidiOutputIndex() < 0)
+        {
+            AlertWindow::showMessageBox(AlertWindow::AlertIconType::NoIcon, "Not connected", "Please connect the Lumatone via USB before performing a firmware update.", "Ok", this);
+            return;
+        }
+
+        DBG("Update requested");
+
+        if (firmwareFileSelected.existsAsFile())
+        {
+            TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastFirmwareBinPath", firmwareFileSelected.getParentDirectory().getFullPathName());
+            TerpstraSysExApplication::getApp().getLumatoneController().requestFirmwareUpdate(firmwareFileSelected, this);
+        }
+        else
+        {
+            infoBox->setText(infoBox->getText() + "Error: Not a valid firmware file...");
+        }
+    }
+}
+
+// TODO: use LumatoneFirmwareVersion
+void FirmwareDlg::updateFirmwareVersionLabel()
+{
+    String firmwareVersion = TerpstraSysExApplication::getApp().getFirmwareVersionStr();
+    if (firmwareVersion != "0.0.0")
+    {
+        firmwareStatusLabel->setText("Current firmware version is: " + firmwareVersion, dontSendNotification);
+    }
+    else
+    {
+        firmwareStatusLabel->setText("Unable to determine firmware version.", dontSendNotification);
+    }
+}
+
+void FirmwareDlg::fileChanged(PathBrowserComponent* source, File newFile)
+{
+    firmwareFileSelected = newFile;
+}
+
+void FirmwareDlg::firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg)
+{
+    if ((int)statusCode <= 0)
+    {
+        firmwareUpdateInProgress = false;
+    }
+
+    if (msg!= "")
+    {
+        msgLog += (msg + "\n");
+        infoNeedsUpdate = true;
+        startTimer(infoUpdateTimeoutMs);
+    }
+}
+
+void FirmwareDlg::timerCallback()
+{
+    if (infoNeedsUpdate)
+    {
+        infoBox->setText(msgLog);
+        infoNeedsUpdate = false;
+    }
+}
+
+void FirmwareDlg::firmwareRevisionReceived(FirmwareVersion version)
+{
+     updateFirmwareVersionLabel();
+     postMessage("Firmware update complete! Lumatone is now running firmware version " + version.toString());
+}
+
+void FirmwareDlg::postMessage(String msg) 
+{
+    msgLog += msg + '\n';
+    infoNeedsUpdate = true;
+    startTimer(infoUpdateTimeoutMs);
+}
\ No newline at end of file
diff --git a/Source/FirmwareDlg.h b/Source/Settings/FirmwareDlg.h
similarity index 58%
rename from Source/FirmwareDlg.h
rename to Source/Settings/FirmwareDlg.h
index 652dc965..677932e4 100644
--- a/Source/FirmwareDlg.h
+++ b/Source/Settings/FirmwareDlg.h
@@ -9,16 +9,16 @@
 */
 
 #pragma once
-#include "FileBrowserComponent.h"
-#include "FirmwareTransfer.h"
+#include "../FileBrowserComponent.h"
+#include "../FirmwareTransfer.h"
+#include "../LumatoneController.h"
 
 
 class FirmwareDlg : public Component, 
     protected Button::Listener, 
     protected PathBrowserComponent::Listener,
     protected FirmwareTransfer::ProcessListener,
-    protected Thread::Listener,
-    protected TerpstraMidiDriver::Listener, // Probably could be done in FirmwareTransfer
+    protected LumatoneController::FirmwareListener,
     private Timer
 {
 public:
@@ -30,11 +30,11 @@ class FirmwareDlg : public Component,
 
     void resized() override;
 
-    void lookAndFeelChanged() override;
-
     void buttonClicked(Button* btn) override;
 
     void updateFirmwareVersionLabel();
+
+    void postMessage(String msgForLog);
     
     //=========================================================================
     // PathBrowserComponent::Listener Implementation
@@ -42,33 +42,17 @@ class FirmwareDlg : public Component,
 
     //=========================================================================
     // FirmwareTransfer::Listener Implementation
-    void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode) override;
+    void firmwareTransferUpdate(FirmwareTransfer::StatusCode statusCode, String msg) override;
 
     //=========================================================================
-    // TerpstraMidiDriver::Listener implementation
-
-    void midiMessageReceived(const MidiMessage& midiMessage) override;
-    void midiMessageSent(const MidiMessage& midiMessage) override {};
-    void midiSendQueueSize(int queueSize) override {};
-    void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) override {};
+    // LumatoneController::FirmwareListener implementation
 
-
-    //=========================================================================
-    // juce::Thread::Listener Implementation
-    void exitSignalSent() override;
+    void firmwareRevisionReceived(FirmwareVersion version) override;
     
     //=========================================================================
     // juce::Timer Implementation
     void timerCallback() override;
 
-private:
-    
-    void initializeFirmwareUpdate();
-
-    void initializeWaitForUpdate();
-
-    double numIncrementsToProgress(int numberOfIncrements);
-    
 private:
 
     bool updateIsAvailable = false;
@@ -76,8 +60,6 @@ class FirmwareDlg : public Component,
 
     File firmwareFileSelected;
 
-    std::unique_ptr<FirmwareTransfer> firmwareTransfer;
-
     //std::unique_ptr<TextButton> checkUpdateBtn;
     std::unique_ptr<PathBrowserComponent> fileBrowser;
     std::unique_ptr<TextButton> doUpdateBtn;
@@ -88,10 +70,4 @@ class FirmwareDlg : public Component,
     String msgLog;
     bool infoNeedsUpdate = false;
     const int infoUpdateTimeoutMs = 100;
-
-    bool waitingForUpdateConfirmation = false;
-    int numberOfWaitIncrements = 0;
-    const int updateIncrementTimeoutMs = 5000;
-    // Estimation based on boot time of ~85 seconds, plus transfer time, and overhead
-    int maxUpdateIncrements = 300000 / updateIncrementTimeoutMs;
 };
diff --git a/Source/SettingsContainer.cpp b/Source/Settings/SettingsContainer.cpp
similarity index 88%
rename from Source/SettingsContainer.cpp
rename to Source/Settings/SettingsContainer.cpp
index b3c9d224..38603d2a 100644
--- a/Source/SettingsContainer.cpp
+++ b/Source/Settings/SettingsContainer.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "SettingsContainer.h"
-#include "Main.h"
+#include "../Main.h"
 
 void SettingsCategoryModel::paintListBoxItem(int rowNumber, Graphics& g, int width, int height, bool rowIsSelected)
 {
@@ -35,8 +35,12 @@ SettingsContainer::SettingsContainer()
 {
     categoryList.reset(new ListBox("CategoryList"));
     categoryList->setModel(&model);
+
     addAndMakeVisible(categoryList.get());
     model.addChangeListener(this);
+
+    auto lastPanelIndex = TerpstraSysExApplication::getApp().getPropertiesFile()->getIntValue("LastSettingsPanel", 0);
+    categoryList->selectRow(lastPanelIndex);
 }
 
 SettingsContainer::~SettingsContainer()
@@ -71,7 +75,8 @@ void SettingsContainer::lookAndFeelChanged()
 
 void SettingsContainer::changeListenerCallback(ChangeBroadcaster* source)
 {
-    showPanel(categoryList->getSelectedRow());
+    auto panelIndex = categoryList->getSelectedRow();
+    showPanel(panelIndex);
 }
 
 void SettingsContainer::showPanel(int editorSettingCategory)
@@ -90,6 +95,8 @@ void SettingsContainer::showPanel(int editorSettingCategory)
 
     if (newPanel)
     {
+        TerpstraSysExApplication::getApp().getPropertiesFile()->setValue("LastSettingsPanel", editorSettingCategory);
+
         removeChildComponent(settingsPanel.get());
         settingsPanel = nullptr;
         settingsPanel.reset(std::move(newPanel));
diff --git a/Source/SettingsContainer.h b/Source/Settings/SettingsContainer.h
similarity index 97%
rename from Source/SettingsContainer.h
rename to Source/Settings/SettingsContainer.h
index fddad6db..5b25a0aa 100644
--- a/Source/SettingsContainer.h
+++ b/Source/Settings/SettingsContainer.h
@@ -9,7 +9,7 @@
 */
 
 #pragma once
-#include "LumatoneEditorLookAndFeel.h"
+#include "../LumatoneEditorLookAndFeel.h"
 #include "CalibrationDlg.h"
 #include "FirmwareDlg.h"
 
diff --git a/Source/SingleNoteAssign.cpp b/Source/SingleNoteAssign.cpp
index 5bafd2fc..d7794876 100644
--- a/Source/SingleNoteAssign.cpp
+++ b/Source/SingleNoteAssign.cpp
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.5
+  Created with Projucer version: 6.0.8
 
   ------------------------------------------------------------------------------
 
@@ -19,7 +19,7 @@
 
 //[Headers] You can add your own extra header files here...
 #include "Main.h"
-#include "MainComponent.h"
+#include "EditActions.h"
 //[/Headers]
 
 #include "SingleNoteAssign.h"
@@ -43,7 +43,7 @@ SingleNoteAssign::SingleNoteAssign ()
 
     channelAutoIncrButton.reset (new juce::ToggleButton ("channelAutoIncrButton"));
     addAndMakeVisible (channelAutoIncrButton.get());
-    channelAutoIncrButton->setButtonText (TRANS("Channels, after Note #: "));
+    channelAutoIncrButton->setButtonText (TRANS("Channels, after Note #:"));
     channelAutoIncrButton->addListener (this);
 
     channelAutoIncrButton->setBounds (8, 264, 160, 24);
@@ -64,7 +64,7 @@ SingleNoteAssign::SingleNoteAssign ()
 
     setColourToggleButton.reset (new juce::ToggleButton ("setColourToggleButton"));
     addAndMakeVisible (setColourToggleButton.get());
-    setColourToggleButton->setButtonText (TRANS("Key Colour:"));
+    setColourToggleButton->setButtonText (TRANS("Key Colour: "));
     setColourToggleButton->addListener (this);
 
     setColourToggleButton->setBounds (8, 96, 112, 24);
@@ -85,6 +85,7 @@ SingleNoteAssign::SingleNoteAssign ()
     keyTypeCombo->addItem (TRANS("Note on/Note off"), 1);
     keyTypeCombo->addItem (TRANS("Continuous controller"), 2);
     keyTypeCombo->addItem (TRANS("Lumatouch"), 3);
+    keyTypeCombo->addItem (TRANS("Disabled"), 4);
     keyTypeCombo->addListener (this);
 
     keyTypeCombo->setBounds (120, 64, 192, 24);
@@ -146,17 +147,27 @@ SingleNoteAssign::SingleNoteAssign ()
 
     keyTypeToggleButton->setButtonText(translate("KeyType"));
     keyTypeToggleButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
+    
+    ccFaderFlipBtn.reset(new juce::ImageButton());
+    ccFaderFlipBtn->setClickingTogglesState(true);
+    ccFaderFlipBtn->addListener(this);
+    ccFaderFlipBtn->setTooltip(translate("Toggle CC polarity inversion. Default, arrow down: values increase with key press. Inverted, arrow up: values decrease with key press."));
+    addAndMakeVisible(ccFaderFlipBtn.get());
+    ccFaderFlipBtn->setColour(TextButton::ColourIds::buttonColourId, Colours::white.withAlpha(0.05f));
+    ccFaderFlipBtn->setColour(TextButton::ColourIds::buttonOnColourId, Colours::grey.withAlpha(0.1f));
+    
+    faderUpArrow = getArrowPath(Point<float>(0.5f, 1.0f), Point<float>(0.5f, 0.0f), 0.5f, 0.25f);
+    faderDownArrow = getArrowPath(Point<float>(0.5f, 0.0f), Point<float>(0.5f, 1.0f), 0.5f, 0.75f);
 
-    setColourToggleButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
+    keyTypeCombo->getProperties().set(LumatoneEditorStyleIDs::popupMenuTargetWidth, 1);
 
+    setColourToggleButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
     colourSubwindow->setColour("ff60aac5");
 
     setNoteToggleButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
-
     noteInput->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, controlBoxFontHeightScalar);
 
     setChannelToggleButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
-
     channelInput->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, controlBoxFontHeightScalar);
 
     autoIncrementLabel->setFont(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium));
@@ -166,16 +177,25 @@ SingleNoteAssign::SingleNoteAssign ()
     noteAutoIncrButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
 
     channelAutoIncrButton->setColour(ToggleButton::ColourIds::textColourId, toggleTextColour);
-    
     channelAutoIncrNoteInput->getProperties().set(LumatoneEditorStyleIDs::fontHeightScalar, controlBoxFontHeightScalar);
 
     instructionsFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::FranklinGothic);
     parametersFont = TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium);
 
-    //noteInputBox->setVisible(false);
-
     // TODO: load last active colour?
     colourTextEditor->addColourSelectionListener(this);
+    
+    // Set up FlexBox rows
+    for (int i = 0; i <= SingleNoteFlexRows::channelIncrement; i++)
+    {
+        flexRows.add(FlexBox(
+                             FlexBox::Direction::row,
+                             FlexBox::Wrap::noWrap,
+                             FlexBox::AlignContent::center,
+                             FlexBox::AlignItems::center,
+                             FlexBox::JustifyContent::flexStart));
+    }
+    
     //[/UserPreSize]
 
     setSize (320, 400);
@@ -186,7 +206,8 @@ SingleNoteAssign::SingleNoteAssign ()
 	setChannelToggleButton->setToggleState(true, juce::NotificationType::sendNotification);
 	setColourToggleButton->setToggleState(true, juce::NotificationType::sendNotification);
 	keyTypeToggleButton->setToggleState(true, juce::NotificationType::sendNotification);
-	keyTypeCombo->setSelectedId(TerpstraKey::noteOnNoteOff);
+	keyTypeCombo->setSelectedId(LumatoneKeyType::noteOnNoteOff);
+    juce::Timer::callAfterDelay(500, [&]{keyTypeCombo->setSelectedId(2, sendNotification);});
     //[/Constructor]
 }
 
@@ -243,13 +264,25 @@ void SingleNoteAssign::paint (juce::Graphics& g)
 
     g.setColour(Colours::darkgrey);
     g.drawLine(controlsX, separatorY, getWidth() - controlsX, separatorY);
+
+//    // Debug FlexBox positioning
+//    Random r;
+//    for (auto child : getChildren())
+//    {
+//        g.setColour(Colour(r.nextFloat(), r.nextFloat() * 0.5f + 0.5f, r.nextFloat() * 0.5f + 0.5f, 1.0f));
+//        g.drawRect(child->getBounds());
+//    }
+//    for (int i = 0; i < flexBounds.size(); i++)
+//    {
+//        g.setColour(Colours::red);
+//        g.drawRect(flexBounds[i]);
+//    }
     //[/UserPaint]
 }
 
 void SingleNoteAssign::resized()
 {
     //[UserPreResize] Add your own custom resize code here..
-
     float w = getWidth();
     float h = getHeight();
 
@@ -257,86 +290,150 @@ void SingleNoteAssign::resized()
         roundedCornerSize = round(getParentComponent()->getParentComponent()->getParentHeight() * ROUNDEDCORNERTOAPPHEIGHT);
 
     int controlAreaTop = round(h * controlAreaYScalar);
+    
+    int toggleHeight = roundToInt(h * toggleHeightScalar);
+    int toggleHeightScaled = roundToInt(toggleHeight * GLOBALFONTSCALAR);
+    
+    int controlH = roundToInt(h * controlHeightScalar);
+    int controlHScaled = roundToInt(controlH * GLOBALFONTSCALAR);
+    
+    int marginX = roundToInt(controlH * 0.6f);
+    int marginY = roundToInt(h * yMarginScalar);
+    int halfMarginX = roundToInt(marginX * 0.5f);
+    int halfMarginY = roundToInt(marginY * 0.5f);
+        
+    int rowWidth = roundToInt(w - marginX * 2);
+    int toggleWidthMargin = toggleHeight + marginX * 1.25f; // Toggle icon + combined margins
+    
+    //[/UserPreResize]
 
+    //[UserResized] Add your own custom resize handling here..
     instructionsAreaBounds.setBounds(0, 0, w, controlAreaTop);
     instructionsFont.setHeight(instructionsAreaBounds.getHeight() * fontHeightInBounds);
+    controlsX = roundToInt(w * controlsXScalar);
+    
+    instructionsBounds.setBounds(marginX, 0, w - marginX * 2, controlAreaTop);
 
-    controlsX = round(w * controlsXScalar);
-    int marginY = round(h * yMarginScalar);
-    int controlH = round(h * controlHeightScalar);
-    int marginX = round(controlH * 0.6f);
-    int halfWidth = round(w * 0.5f);
-    int toggleHeight = round(h * toggleHeightScalar);
-    int halfMarginX = round(marginX * 0.5f);
-    int halfMarginY = round(marginY * 0.5f);
-
-    instructionsBounds.setBounds(marginX, 0, w - marginX - marginX, controlAreaTop);
-
-    parametersFont.setHeight(toggleHeight * 1.25f);
-    //int comboBoxWidth = round(parametersFont.getStringWidth("127_") * 2);
-
-    keyTypeToggleButton->setTopLeftPosition(controlsX, instructionsAreaBounds.getBottom() + halfMarginY);
-    resizeToggleButtonWithHeight(keyTypeToggleButton.get(), parametersFont, toggleHeight);
-    keyTypeCombo->setSize(w - marginX - keyTypeToggleButton->getRight(), controlH);
-    keyTypeCombo->setCentrePosition(
-        round(keyTypeCombo->getWidth() * 0.5f) + keyTypeToggleButton->getRight(),
-        keyTypeToggleButton->getBounds().getCentreY()
-    );
-
-    setColourToggleButton->setTopLeftPosition(controlsX, keyTypeToggleButton->getBottom() + marginY);
-    resizeToggleButtonWithHeight(setColourToggleButton.get(), parametersFont, toggleHeight);
-    colourSubwindow->setSize(controlH * 1.5f, controlH);
-    colourSubwindow->setCentrePosition(
-        round(colourSubwindow->getWidth() * 0.5f) + setColourToggleButton->getRight(),
-        setColourToggleButton->getBounds().getCentreY()
-    );
-
-    colourTextEditor->setTopLeftPosition(colourSubwindow->getRight() + halfMarginX, colourSubwindow->getY());
-    colourTextEditor->setSize(w - colourTextEditor->getX() - marginX, controlH);
-    colourTextEditor->applyFontToAllText(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium, controlH * CONTROLBOXFONTHEIGHTSCALAR * GLOBALFONTSCALAR), true);
-
-    setNoteToggleButton->setTopLeftPosition(controlsX, setColourToggleButton->getBottom() + marginY);
-    resizeToggleButtonWithHeight(setNoteToggleButton.get(), parametersFont, toggleHeight);
-    noteInput->setSize(w - noteInput->getX() - marginX, controlH);
-	noteInput->setCentrePosition(
-        round(noteInput->getWidth() * 0.5f) + setNoteToggleButton->getRight(),
-        setNoteToggleButton->getBounds().getCentreY()
-    );
-    noteInput->setTextBoxStyle(Slider::TextEntryBoxPosition::TextBoxLeft, false, roundToInt(noteInput->getWidth() * incDecButtonTextBoxWidthScalar), noteInput->getHeight());
-
-    setChannelToggleButton->setTopLeftPosition(controlsX, setNoteToggleButton->getBottom() + marginY);
-    setChannelToggleButton->setSize(noteInput->getX() - controlsX, toggleHeight);
-    channelInput->setCentrePosition(
-        round(channelInput->getWidth() * 0.5f) + setChannelToggleButton->getRight(),
-        setChannelToggleButton->getBounds().getCentreY()
-    );
-    channelInput->setTopLeftPosition(noteInput->getX(), channelInput->getY());
-    channelInput->setSize(noteInput->getWidth(), controlH);
-    channelInput->setTextBoxStyle(Slider::TextEntryBoxPosition::TextBoxLeft, false, roundToInt(channelInput->getWidth() * incDecButtonTextBoxWidthScalar), channelInput->getHeight());
-
-    separatorY = setChannelToggleButton->getBottom() + halfMarginY;
-
-    autoIncrementLabel->setBounds(controlsX, separatorY + halfMarginY, w - controlsX, controlH);
-
-    noteAutoIncrButton->setTopLeftPosition(controlsX, autoIncrementLabel->getBottom() + halfMarginY);
-    resizeToggleButtonWithHeight(noteAutoIncrButton.get(), parametersFont, toggleHeight);
-
-    channelAutoIncrButton->setTopLeftPosition(controlsX, noteAutoIncrButton->getBottom() + halfMarginY);
-    resizeToggleButtonWithHeight(channelAutoIncrButton.get(), parametersFont, toggleHeight);
-
-    int chAutoIncBtnRightAdj = channelAutoIncrButton->getRight() - halfMarginX;
-
-    channelAutoIncrNoteInput->setSize(w - marginX - chAutoIncBtnRightAdj, controlH);
-    channelAutoIncrNoteInput->setCentrePosition(
-        chAutoIncBtnRightAdj + roundToInt(channelAutoIncrNoteInput->getWidth() * 0.5f),
-        channelAutoIncrButton->getBounds().getCentreY()
-    );
+    parametersFont.setHeight(toggleHeightScaled);
+    
+    flexBounds.clear();
+    auto tglTemplateItem = FlexItem().withHeight(toggleHeightScaled).withAlignSelf(FlexItem::AlignSelf::center);
+    auto ctrlTemplateItem = FlexItem(FlexItem::autoValue, controlH).withFlex(1.0f);
+    
+    auto getTglWidth = [=](ToggleButton* btn) {
+        return roundToInt(parametersFont.getStringWidthFloat(btn->getButtonText()) + toggleWidthMargin);
+    };
+    
+    for (int i = 0; i <= SingleNoteFlexRows::channelIncrement; i++)
+    {
+        auto row = flexRows.getReference(i);
+        row.items.clear();
+        
+        // Generalize row properties
+        auto toggleItem = FlexItem(tglTemplateItem);
+        auto setupToggleItem = [&] (ToggleButton* btn) {
+            toggleItem.width = getTglWidth(btn);
+            toggleItem.associatedComponent = btn;
+        };
+        
+        auto controlItem = FlexItem(ctrlTemplateItem);
+        
+        auto getAndPerformBounds = [&] () {
+            auto bounds = Rectangle<int>(controlsX, flexBounds[i - 1].getBottom() + halfMarginY, rowWidth, controlH);
+            flexBounds.add(bounds);
+            row.performLayout(bounds);
+        };
+        
+        switch (i)
+        {
+            case SingleNoteFlexRows::keyType:
+            {
+                setupToggleItem(keyTypeToggleButton.get());
+                row.items.add(toggleItem);
+                
+                controlItem.associatedComponent = keyTypeCombo.get();
+                row.items.add(controlItem);
+                
+                flexBounds.add(Rectangle<int>(controlsX, controlAreaTop + halfMarginY, rowWidth, controlH));
+                row.performLayout(flexBounds[i]);
+                break;
+            }
+            case SingleNoteFlexRows::keyColour:
+            {
+                setupToggleItem(setColourToggleButton.get());
+                row.items.add(toggleItem);
+                
+                auto colourItem = FlexItem(controlH * 1.5f, controlH, *colourSubwindow.get());
+                colourItem.margin = FlexItem::Margin(0, halfMarginX, 0, 0);
+                row.items.add(colourItem);
+                
+                controlItem.associatedComponent = colourTextEditor.get();
+                row.items.add(controlItem);
+                
+                getAndPerformBounds();
+                break;
+            }
+            case SingleNoteFlexRows::keyNum:
+            {
+                setupToggleItem(setNoteToggleButton.get());
+                row.items.add(toggleItem);
+                
+                if (keyTypeCombo->getSelectedId() == LumatoneKeyType::continuousController)
+                {
+                    auto ccInvertItem = FlexItem(controlH, controlH, *ccFaderFlipBtn.get());
+                    ccInvertItem.margin = FlexItem::Margin(0, halfMarginX, 0, 0);
+                    row.items.add(ccInvertItem);
+                }
+                
+                controlItem.associatedComponent = noteInput.get();
+                row.items.add(controlItem);
+                
+                getAndPerformBounds();
+                break;
+            }
+            case SingleNoteFlexRows::keyChannel:
+            {
+                setupToggleItem(setChannelToggleButton.get());
+                row.items.add(toggleItem);
+                
+                controlItem.associatedComponent = channelInput.get();
+                row.items.add(controlItem);
+                
+                getAndPerformBounds();
+                
+                // Position Auto-Increment section since channelIncrement is relative to it
+                separatorY = channelInput->getBottom() + halfMarginY;
+                autoIncrementLabel->setBounds(controlsX, separatorY + halfMarginY, w - controlsX, controlHScaled);
+                noteAutoIncrButton->setTopLeftPosition(controlsX, autoIncrementLabel->getBottom() + halfMarginY);
+                resizeToggleButtonWithHeight(noteAutoIncrButton.get(), parametersFont, toggleHeightScaled);
+                break;
+            }
+            case SingleNoteFlexRows::channelIncrement:
+            {
+                setupToggleItem(channelAutoIncrButton.get());
+                row.items.add(toggleItem);
+                
+                controlItem.associatedComponent = channelAutoIncrNoteInput.get();
+                row.items.add(controlItem);
+                
+                flexBounds.add(Rectangle<int>(controlsX, noteAutoIncrButton->getBottom() + halfMarginY, rowWidth, controlH));
+                row.performLayout(flexBounds[i]);
+                break;
+            }
+            default:
+                break;
+        }
+    }
 
-    // Logically, setting the width would make the buttons' width 0, but that's not happening...so use max width available
-    channelAutoIncrNoteInput->setTextBoxStyle(Slider::TextBoxLeft, false, channelAutoIncrNoteInput->getWidth(), channelAutoIncrNoteInput->getHeight());
-    //[/UserPreResize]
+    // Style adjustments
+    colourTextEditor->applyFontToAllText(TerpstraSysExApplication::getApp().getAppFont(LumatoneEditorFont::GothamNarrowMedium, controlHScaled * CONTROLBOXFONTHEIGHTSCALAR), true);
 
-    //[UserResized] Add your own custom resize handling here..
+    noteInput->setTextBoxStyle(Slider::TextEntryBoxPosition::TextBoxLeft, false, roundToInt(noteInput->getWidth() * incDecButtonTextBoxWidthScalar), noteInput->getHeight());
+    
+    if (keyTypeCombo->getSelectedId() == LumatoneKeyType::continuousController)
+        redrawCCFlipBtn();
+    
+    channelInput->setTextBoxStyle(Slider::TextEntryBoxPosition::TextBoxLeft, false, roundToInt(channelInput->getWidth() * incDecButtonTextBoxWidthScalar), channelInput->getHeight());
     //[/UserResized]
 }
 
@@ -391,6 +488,9 @@ void SingleNoteAssign::buttonClicked (juce::Button* buttonThatWasClicked)
     }
 
     //[UserbuttonClicked_Post]
+    else if (buttonThatWasClicked == ccFaderFlipBtn.get())
+    {
+    }
     //[/UserbuttonClicked_Post]
 }
 
@@ -404,17 +504,19 @@ void SingleNoteAssign::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
         //[UserComboBoxCode_keyTypeCombo] -- add your combo box handling code here..
 
         // Label the "note box" accordingly (controller no. for key type "Fader")
-        if (keyTypeCombo->getSelectedId() == TerpstraKey::KEYTYPE::continuousController)
+        if (keyTypeCombo->getSelectedId() == LumatoneKeyType::continuousController)
         {
-            setNoteToggleButton->setButtonText("CC Type:");
-
-            // ToDo Auto increment does not make sense in this case?
+            setNoteToggleButton->setButtonText("CC #:");
+            ccFaderFlipBtn->setVisible(true);
         }
         else
         {
             setNoteToggleButton->setButtonText("Note # (0-127):");
+            ccFaderFlipBtn->setVisible(false);
         }
 
+        resized();
+
         //[/UserComboBoxCode_keyTypeCombo]
     }
 
@@ -455,7 +557,6 @@ void SingleNoteAssign::lookAndFeelChanged()
     auto lookAndFeel = dynamic_cast<LumatoneEditorLookAndFeel*>(&getLookAndFeel());
     if (lookAndFeel)
     {
-        lookAndFeel->setupComboBox(*keyTypeCombo);
         lookAndFeel->setupTextEditor(*colourTextEditor);
     }
 }
@@ -467,56 +568,32 @@ void SingleNoteAssign::colourChangedCallback(ColourSelectionBroadcaster* source,
 }
 
 /// <summary>Called from parent when one of the keys is clicked</summary>
-/// <returns>Mapping was changed yes/no</returns>
-bool SingleNoteAssign::performMouseDown(int setSelection, int keySelection)
+/// <returns>Pointer to undoable action to be passed to the undo manager. The latter has to be done in calling function.</returns>
+UndoableAction* SingleNoteAssign::createEditAction(int setSelection, int keySelection)
 {
-	bool mappingChanged = false;
-	jassert(setSelection >= 0 && setSelection < NUMBEROFBOARDS && keySelection >= 0 && keySelection < TerpstraSysExApplication::getApp().getOctaveBoardSize());
-
-	TerpstraKey& keyData = (dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent()))->getMappingInEdit().sets[setSelection].theKeys[keySelection];
-
-	// Set note if specified
-	if (setNoteToggleButton->getToggleState())
-	{
-		keyData.noteNumber = noteInput->getValue();
-		mappingChanged = true;
-	}
-
-	// Set channel if specified
-	if (setChannelToggleButton->getToggleState())
-	{
-		keyData.channelNumber = channelInput->getValue();	// 1-16
-		mappingChanged = true;
-	}
-
-	// Set colour if specified
-	if (setColourToggleButton->getToggleState())
-	{
-		keyData.colour = colourSubwindow->getColourAsObject();
-		mappingChanged = true;
-	}
-
-	// Set key type if specified
-	if (keyTypeToggleButton->getToggleState())
-	{
-		keyData.keyType = (TerpstraKey::KEYTYPE)keyTypeCombo->getSelectedId();	// XXX if no selection?
-		mappingChanged = true;
-	}
-
-	// Send to device
-	TerpstraSysExApplication::getApp().getMidiDriver().sendKeyParam(setSelection + 1, keySelection, keyData);
-
+	int newNote = noteInput->getValue();
+	int newChannel = channelInput->getValue();
+	
+	auto editAction = new Lumatone::SingleNoteAssignAction(
+		setSelection, keySelection,
+		keyTypeToggleButton->getToggleState(), setChannelToggleButton->getToggleState(),
+		setNoteToggleButton->getToggleState(), setColourToggleButton->getToggleState(),
+		(LumatoneKeyType)keyTypeCombo->getSelectedId(), newChannel,
+		newNote, colourSubwindow->getColourAsObject());
+
+	jassert(editAction != nullptr && editAction->isValid());
+	
 	// Auto increment note
 	if (noteAutoIncrButton->getToggleState())
 	{
-		int newNote = keyData.noteNumber + 1;
+		newNote++;
 
 		// Auto increment channel
 		if (channelAutoIncrButton->getToggleState() && channelAutoIncrNoteInput->getValue() > 0 &&
 			newNote > channelAutoIncrNoteInput->getValue())
 		{
 			newNote = 0;
-			int newChannel = keyData.channelNumber + 1;
+			newChannel++;
 			if (newChannel > 16)
 				newChannel = 1;
 			channelInput->setValue(newChannel);
@@ -528,7 +605,7 @@ bool SingleNoteAssign::performMouseDown(int setSelection, int keySelection)
 		noteInput->setValue(newNote);
 	}
 
-	return mappingChanged;
+	return editAction;
 }
 
 void SingleNoteAssign::onSetData(TerpstraKeyMapping& newData)
@@ -553,6 +630,9 @@ void SingleNoteAssign::restoreStateFromPropertiesFile(PropertiesFile* properties
 	keyTypeToggleButton->setToggleState(
 		propertiesFile->getBoolValue("SingleNoteKeyTypeSetActive", true),
 		juce::NotificationType::sendNotification);
+    ccFaderFlipBtn->setToggleState(
+       propertiesFile->getBoolValue("SingleNoteKeyCCFlipped", false),
+       juce::NotificationType::sendNotification);
 }
 
 void SingleNoteAssign::saveStateToPropertiesFile(PropertiesFile* propertiesFile)
@@ -563,6 +643,49 @@ void SingleNoteAssign::saveStateToPropertiesFile(PropertiesFile* propertiesFile)
 	propertiesFile->setValue("SingleNoteKeyTypeSetActive", keyTypeToggleButton->getToggleState());
 
 }
+
+void SingleNoteAssign::redrawCCFlipBtn()
+{
+    Path arrowPath, faderPath, arrowInvertedPath, faderInvertedPath;
+    getCCPolarityIconPath(false, arrowPath, faderPath);
+    getCCPolarityIconPath(true, arrowInvertedPath, faderInvertedPath);
+    auto defaultImg = Image(Image::PixelFormat::ARGB, ccFaderFlipBtn->getWidth(), ccFaderFlipBtn->getHeight(), true);
+    auto invertedImg = defaultImg.createCopy();
+    
+    Graphics g(defaultImg);
+    Graphics gi(invertedImg);
+    
+    auto transform = AffineTransform::scale(defaultImg.getWidth(), defaultImg.getHeight());
+    arrowPath.applyTransform(transform);
+    faderPath.applyTransform(transform);
+    arrowInvertedPath.applyTransform(transform);
+    faderInvertedPath.applyTransform(transform);
+    
+    auto lookAndFeel = &TerpstraSysExApplication::getApp().getLookAndFeel();
+    auto background = lookAndFeel->findColour(TextButton::ColourIds::buttonColourId);
+    g.setColour(background);
+    g.fillRoundedRectangle(ccFaderFlipBtn->getLocalBounds().toFloat(), 5.0f);
+    gi.setColour(background);
+    gi.fillRoundedRectangle(ccFaderFlipBtn->getLocalBounds().toFloat(), 5.0f);
+    
+    auto arrowStroke = PathStrokeType(PHI, PathStrokeType::JointStyle::curved);
+    auto colour = lookAndFeel->findColour(LumatoneEditorColourIDs::ActiveText).brighter(0.1);
+    g.setColour(colour);
+    g.strokePath(arrowPath, arrowStroke);
+    g.fillPath(faderPath);
+    
+    gi.setColour(colour);
+    gi.strokePath(arrowInvertedPath, arrowStroke);
+    gi.fillPath(faderInvertedPath);
+    
+//    auto mouseOverImg = ccFaderFlipBtn->getToggleState() ? &invertedImg : &defaultImg;
+    auto highlight = Colours::white.withAlpha(0.0333f);
+    
+    ccFaderFlipBtn->setImages(false, false, true,
+      defaultImg, 1.0f, Colour(),
+      defaultImg, 1.0f, highlight,
+      invertedImg, 1.0f, Colour());
+}
 //[/MiscUserCode]
 
 
@@ -585,7 +708,7 @@ BEGIN_JUCER_METADATA
                 virtualName="" explicitFocusOrder="0" pos="8 232 160 24" buttonText="Notes-Per-Click"
                 connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="channelAutoIncrButton" id="1749290d10236ec3" memberName="channelAutoIncrButton"
-                virtualName="" explicitFocusOrder="0" pos="8 264 160 24" buttonText="Channels, after Note #"
+                virtualName="" explicitFocusOrder="0" pos="8 264 160 24" buttonText="Channels, after Note #:"
                 connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="setNoteToggleButton" id="79f2522d584925d1" memberName="setNoteToggleButton"
                 virtualName="" explicitFocusOrder="0" pos="8 128 112 24" buttonText="Note # (0-127):"
@@ -594,14 +717,14 @@ BEGIN_JUCER_METADATA
                 virtualName="" explicitFocusOrder="0" pos="8 160 112 24" buttonText="Channel (1-16):"
                 connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="setColourToggleButton" id="fb41f2b9539dfb3f" memberName="setColourToggleButton"
-                virtualName="" explicitFocusOrder="0" pos="8 96 112 24" buttonText="Key Colour:"
+                virtualName="" explicitFocusOrder="0" pos="8 96 112 24" buttonText="Key Colour: "
                 connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
   <TOGGLEBUTTON name="keyTypeToggleButton" id="3f2eba6027c4f2f5" memberName="keyTypeToggleButton"
                 virtualName="" explicitFocusOrder="0" pos="8 64 112 24" buttonText="Key type:"
                 connectedEdges="0" needsCallback="1" radioGroupId="0" state="0"/>
   <COMBOBOX name="keyTypeCombo" id="6a64d9cabf0d810f" memberName="keyTypeCombo"
             virtualName="" explicitFocusOrder="0" pos="120 64 192 24" editable="0"
-            layout="33" items="Note on/Note off&#10;Continuous controller&#10;Lumatouch"
+            layout="33" items="Note on/Note off&#10;Continuous controller&#10;Lumatouch&#10;Disabled"
             textWhenNonSelected="" textWhenNoItems="(no choices)"/>
   <SLIDER name="noteInput" id="5858bc8c893dc11" memberName="noteInput"
           virtualName="" explicitFocusOrder="0" pos="120 128 112 24" tooltip="MIDI note or MIDI controller no. (for key type 'continuous controller')"
diff --git a/Source/SingleNoteAssign.h b/Source/SingleNoteAssign.h
index c9233e2a..1abbc489 100644
--- a/Source/SingleNoteAssign.h
+++ b/Source/SingleNoteAssign.h
@@ -7,7 +7,7 @@
   the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
   and re-saved.
 
-  Created with Projucer version: 6.0.5
+  Created with Projucer version: 6.0.8
 
   ------------------------------------------------------------------------------
 
@@ -50,7 +50,7 @@ class SingleNoteAssign  : public Component,
 
     //==============================================================================
     //[UserMethods]     -- You can add your own custom methods in this section.
-	bool performMouseDown(int setSelection, int keySelection);
+	UndoableAction* createEditAction(int setSelection, int keySelection);
 	void onSetData(TerpstraKeyMapping& newData);
 
 	void restoreStateFromPropertiesFile(PropertiesFile* propertiesFile);
@@ -62,6 +62,8 @@ class SingleNoteAssign  : public Component,
     ColourTextEditor* getColourTextEditor() { return colourTextEditor.get(); }
 
     void colourChangedCallback(ColourSelectionBroadcaster* source, Colour newColour) override;
+    
+    void redrawCCFlipBtn();
     //[/UserMethods]
 
     void paint (juce::Graphics& g) override;
@@ -84,23 +86,38 @@ class SingleNoteAssign  : public Component,
 
     Font instructionsFont;
     Font parametersFont;
+    
+    Array<FlexBox> flexRows;
+    Array<Rectangle<int>> flexBounds; // Primarily for debugging
+    enum SingleNoteFlexRows
+    {
+        keyType = 0,
+        keyColour,
+        keyNum,
+        keyChannel,
+        channelIncrement
+    };
 
     //==============================================================================
     // Size and position constants
     const float fontHeightInBounds  = 0.21f;
 
     const float xMarginScalar       = 0.0917f;
-    const float yMarginScalar       = 0.0813f;
+    const float yMarginScalar       = 0.075f;
     const float controlAreaYScalar  = 0.183333f;
-    const float controlsXScalar     = 0.06;
+    const float controlsXScalar     = 0.06f;
     const float separatorYScalar    = 0.666667f;
-    const float toggleHeightScalar  = 0.034f;
+    const float toggleHeightScalar  = 0.042f;
     const float controlHeightScalar = 0.0647f;
 
     const float controlBoxFontHeightScalar     = 0.75f;
     const float incDecButtonTextBoxWidthScalar = 0.4f;
 
     const Colour toggleTextColour = Colour(0xffcbcbcb);
+    
+    std::unique_ptr<juce::ImageButton> ccFaderFlipBtn;
+    Path faderDownArrow;
+    Path faderUpArrow;
     //[/UserVariables]
 
     //==============================================================================
@@ -117,7 +134,7 @@ class SingleNoteAssign  : public Component,
     std::unique_ptr<ColourTextEditor> colourTextEditor;
     std::unique_ptr<juce::Slider> channelInput;
     std::unique_ptr<juce::Slider> channelAutoIncrNoteInput;
-
+    
 
     //==============================================================================
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SingleNoteAssign)
diff --git a/Source/TerpstraMidiDriver.cpp b/Source/TerpstraMidiDriver.cpp
index 8bd6b02f..29137b54 100644
--- a/Source/TerpstraMidiDriver.cpp
+++ b/Source/TerpstraMidiDriver.cpp
@@ -13,7 +13,7 @@
 
 TerpstraMidiDriver::TerpstraMidiDriver() : HajuMidiDriver()
 {
-	autoSave = false;
+
 }
 
 TerpstraMidiDriver::~TerpstraMidiDriver()
@@ -30,328 +30,590 @@ void TerpstraMidiDriver::removeListener(TerpstraMidiDriver::Listener* listener)
 	listeners.remove(listener);
 }
 
-void TerpstraMidiDriver::setSysExSendingMode(sysExSendingMode newMode)
-{
-	if (newMode != currentSysExSendingMode)
-	{
-		currentSysExSendingMode = newMode;
-		if (currentSysExSendingMode == sysExSendingMode::offlineEditor)
-		{
-			clearMIDIMessageBuffer();	// ToDo remove only SysEx messages (leave NoteOn/NoteOff)?
-			stopTimer();
-			hasMsgWaitingForAck = false;
-		}
-	}
-}
-
 /*
 ==============================================================================
-Combined (hi-level) commands
+Single (mid-level) commands, firmware specific
 */
 
-void TerpstraMidiDriver::sendAllParamsOfBoard(int boardIndex, TerpstraKeys boardData)
+// CMD 00h: Send a single key's functionctional configuration
+void TerpstraMidiDriver::sendKeyFunctionParameters(uint8 boardIndex, uint8 keyIndex, uint8 noteOrCCNum, uint8 midiChannel, uint8 keyType, bool faderUpIsNull)
 {
-	for (int keyIndex = 0; keyIndex < TerpstraSysExApplication::getApp().getOctaveBoardSize(); keyIndex++)
-		sendKeyParam(boardIndex, keyIndex, boardData.theKeys[keyIndex]);
+    // boardIndex is expected 1-based
+    jassert(boardIndex > 0 && boardIndex <= NUMBEROFBOARDS);
+    //jassert(midiChannel > 0 && midiChannel <= 16);
+    midiChannel = (midiChannel - 1) & 0xF;
+    uint8 typeByte = (faderUpIsNull << 4) | keyType;
+    sendSysEx(boardIndex, CHANGE_KEY_NOTE, keyIndex, noteOrCCNum, midiChannel, typeByte);
 }
 
-void TerpstraMidiDriver::sendCompleteMapping(TerpstraKeyMapping mappingData)
+// CMD 01h: Send a single key's LED channel intensities
+void TerpstraMidiDriver::sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue)
 {
-	for (int boardIndex = 1; boardIndex <= NUMBEROFBOARDS; boardIndex++)
-		sendAllParamsOfBoard(boardIndex, mappingData.sets[boardIndex-1]);
-}
+    MidiMessage msg = createExtendedKeyColourSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, red, green, blue);
 
-void TerpstraMidiDriver::sendGetMappingOfBoardRequest(int boardIndex)
-{
-    sendRedLEDConfigurationRequest(boardIndex);
-    sendGreenLEDConfigurationRequest(boardIndex);
-    sendBlueLEDConfigurationRequest(boardIndex);
-    sendChannelConfigurationRequest(boardIndex);
-    sendNoteConfigurationRequest(boardIndex);
-    sendKeyTypeConfigurationRequest(boardIndex);
+    sendMessageWithAcknowledge(msg);
 }
 
-void TerpstraMidiDriver::sendGetCompleteMappingRequest()
+// CMD 01h: Send a single key's LED channel intensities, three pairs of 4-bit values for each channel
+void TerpstraMidiDriver::sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower)
 {
-	for (int boardIndex = 1; boardIndex <= NUMBEROFBOARDS; boardIndex++)
-		sendGetMappingOfBoardRequest(boardIndex);
+    // boardIndex is expected 1-based
+    jassert(boardIndex > 0 && boardIndex <= NUMBEROFBOARDS);
+
+    if (redUpper   > 0xf) redUpper   &= 0xf;
+    if (redLower   > 0xf) redLower   &= 0xf;
+    if (greenUpper > 0xf) greenUpper &= 0xf;
+    if (greenLower > 0xf) greenLower &= 0xf;
+    if (blueUpper  > 0xf) blueUpper  &= 0xf;
+    if (blueLower  > 0xf) blueLower  &= 0xf;
+ 
+    MidiMessage msg = createExtendedKeyColourSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
 }
 
-/*
-==============================================================================
-Single (mid-level) commands
-*/
-
-void TerpstraMidiDriver::sendKeyParam(int boardIndex, int keyIndex, TerpstraKey keyData)
+// CMD 01h: Send a single key's LED channel intensities (pre-version 1.0.11)
+void TerpstraMidiDriver::sendKeyLightParameters_Version_1_0_0(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue)
 {
-	// boardIndex is expected 1-based
-	jassert(boardIndex > 0 && boardIndex <= NUMBEROFBOARDS);
+    // boardIndex is expected 1-based
+    jassert(boardIndex > 0 && boardIndex <= NUMBEROFBOARDS);
+
+    // clip if exceed 0x7f
+    if (red > 0x7f) red &= 0x7f;
+    if (green > 0x7f) green &= 0x7f;
+    if (blue > 0x7f) blue &= 0x7f;
 
-	// Channel, note, key type (note on/note off or continuous controller)
-	if (keyData.channelNumber >= 0)
-		sendSysEx(boardIndex, CHANGE_KEY_NOTE, keyIndex, keyData.noteNumber, keyData.channelNumber - 1, keyData.keyType);
+    sendSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, red, green, blue);
+}
 
-	// Colour. Values from 0x00 to 0x7f (127 decimal, as the maximal value for data bytes is according to the MIDI standard)
-	sendSysEx(boardIndex, SET_KEY_COLOUR, keyIndex, keyData.colour.getRed() / 2, keyData.colour.getGreen() / 2, keyData.colour.getBlue() / 2);
+// CMD 02h: Save current configuration to specified preset index
+void TerpstraMidiDriver::saveProgram(uint8 presetNumber)
+{
+    jassert(presetNumber >= 0 && presetNumber < 10);
+    sendSysEx(0, SAVE_PROGRAM, presetNumber, '\0', '\0', '\0');
 }
 
-// Send expression pedal sensivity
-void TerpstraMidiDriver::sendExpressionPedalSensivity(unsigned char value)
+// CMD 03h: Send expression pedal sensivity
+void TerpstraMidiDriver::sendExpressionPedalSensivity(uint8 value)
 {
 	jassert(value <= 0x7f);
 
 	sendSysEx(0, SET_FOOT_CONTROLLER_SENSITIVITY, value, '\0', '\0', '\0');
 }
 
-// Send parametrization of foot controller
+// CMD 04h: Send parametrization of foot controller
 void TerpstraMidiDriver::sendInvertFootController(bool value)
 {
-	sendSysEx(0, INVERT_FOOT_CONTROLLER, value ? '\1' : '\0', '\0', '\0', '\0');
+    sendSysExToggle(0, INVERT_FOOT_CONTROLLER, value);
+}
+
+// CMD 05h: Colour for macro button in active state, each value should be in range of 0x0-0xF and represents the upper and lower four bytes of each channel intensity
+void TerpstraMidiDriver::sendMacroButtonActiveColour(uint8 red, uint8 green, uint8 blue)
+{
+    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_ON, red, green, blue);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+void TerpstraMidiDriver::sendMacroButtonActiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower)
+{
+    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_ON, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
+    sendMessageWithAcknowledge(msg);
+}
+
+// CMD 05h: Colour for macro button in active state, each value should be in range of 0x00-0x7F (pre-version 1.0.11)
+void TerpstraMidiDriver::sendMacroButtonActiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue)
+{
+    if (red   > 0x7f) red   &= 0x7f;
+    if (green > 0x7f) green &= 0x7f;
+    if (blue  > 0x7f) blue  &= 0x7f;
+
+	sendSysEx(0, MACROBUTTON_COLOUR_ON, red, green, blue, '\0');
 }
 
-// Colour for macro button in active state
-void TerpstraMidiDriver::sendMacroButtonActiveColour(String colourAsString)
+// CMD 06h: Colour for macro button in inactive state, each value should be in range of 0x0-0xF and represents the upper and lower four bytes of each channel intensity
+void TerpstraMidiDriver::sendMacroButtonInactiveColour(int red, int green, int blue)
 {
-	int colourAsNumber = colourAsString.getHexValue32();
-	Colour theColour = Colour(colourAsNumber);
-	sendSysEx(0, MACROBUTTON_COLOUR_ON, theColour.getRed() / 2, theColour.getGreen() / 2, theColour.getBlue() / 2, '\0');
+    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_OFF, red, green, blue);
+    sendMessageWithAcknowledge(msg);
 }
 
-// Colour for macro button in inactive state
-void TerpstraMidiDriver::sendMacroButtonInactiveColour(String colourAsString)
+// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+void TerpstraMidiDriver::sendMacroButtonInactiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower)
 {
-	int colourAsNumber = colourAsString.getHexValue32();
-	Colour theColour = Colour(colourAsNumber);
-	sendSysEx(0, MACROBUTTON_COLOUR_OFF, theColour.getRed() / 2, theColour.getGreen() / 2, theColour.getBlue() / 2, '\0');
+    MidiMessage msg = createExtendedMacroColourSysEx(MACROBUTTON_COLOUR_OFF, redUpper, redLower, greenUpper, greenLower, blueUpper, blueLower);
+    sendMessageWithAcknowledge(msg);
 }
 
+// CMD 06h: Colour for macro button in inactive state, each value should be in range of 0x00-0x7F (pre-version 1.0.11)
+void TerpstraMidiDriver::sendMacroButtonInactiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue)
+{
+    if (red   > 0x7f) red   &= 0x7f;
+    if (green > 0x7f) green &= 0x7f;
+    if (blue  > 0x7f) blue  &= 0x7f;
+
+	sendSysEx(0, MACROBUTTON_COLOUR_OFF, red, green, blue, '\0');
+}
+
+// CMD 07h: Send parametrization of light on keystrokes
 void TerpstraMidiDriver::sendLightOnKeyStrokes(bool value)
 {
-	sendSysEx(0, SET_LIGHT_ON_KEYSTROKES, value ? '\1' : '\0', '\0', '\0', '\0');
+    sendSysExToggle(0, SET_LIGHT_ON_KEYSTROKES, value);
 }
 
+// CMD 08h: Send a value for a velocity lookup table
+void TerpstraMidiDriver::sendVelocityConfig(const uint8 velocityTable[])
+{
+    // Values are in reverse order (shortest ticks count is the highest velocity)
+    uint8 reversedTable[128];
+    for (uint8 x = 0; x < 128; x++)
+    {
+        reversedTable[x] = velocityTable[127 - x] & 0x7f;
+    }
+
+    MidiMessage msg = sendTableSysEx(0, SET_VELOCITY_CONFIG, 128, reversedTable);
+		
+	sendMessageWithAcknowledge(msg);
+}
+
+// CMD 09h: Save velocity config to EEPROM
+void TerpstraMidiDriver::saveVelocityConfig()
+{            
+    sendSysExRequest(0, SAVE_VELOCITY_CONFIG);
+}
 
-// Send a value for a velocity lookup table
-void TerpstraMidiDriver::sendVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType, unsigned char velocityTable[])
+// CMD 0Ah: Reset velocity config to value from EEPROM
+void TerpstraMidiDriver::resetVelocityConfig()
 {
-	if (midiOutput != nullptr)
-	{
-		unsigned char sysExData[133];
-		sysExData[0] = (manufacturerId >> 16) & 0xff;
-		sysExData[1] = (manufacturerId >> 8) & 0xff;
-		sysExData[2] = manufacturerId & 0xff;
-		sysExData[3] = '\0';
+    sendSysExRequest(0, RESET_VELOCITY_CONFIG);
+}
 
-		switch(velocityCurveType)
-		{
-		    case TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff:
-                sysExData[4] = SET_VELOCITY_CONFIG;
-                break;
-            case TerpstraVelocityCurveConfig::VelocityCurveType::fader:
-                sysExData[4] = SET_FADER_CONFIG;
-                break;
-            case TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch:
-                sysExData[4] = SET_AFTERTOUCH_CONFIG;
-                break;
-			case TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch:
-				sysExData[4] = SET_LUMATOUCH_CONFIG;
-				break;
-			default:
-                jassert(false);
-                break;
-		}
+// CMD 0Bh: Adjust the internal fader look-up table (128 7-bit values)
+void TerpstraMidiDriver::sendFaderConfig(const uint8 faderTable[])
+{
+    MidiMessage msg = sendTableSysEx(0, SET_FADER_CONFIG, 128, faderTable);
+    sendMessageWithAcknowledge(msg);
+}
 
-		if (velocityCurveType == TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff)
-		{
-			// Values are in reverse order (shortest ticks count is the highest velocity)
-			for (int x = 0; x < 128; x++)
-			{
-				sysExData[5 + x] = velocityTable[127 - x];
+// CMD 0Ch: **DEPRECATED** Save the changes made to the fader look-up table
+void TerpstraMidiDriver::saveFaderConfiguration()
+{
+    sendSysExRequest(0, SAVE_FADER_CONFIG);
+}
 
-			}
+// CMD 0Dh: Reset the fader lookup table back to its factory fader settings.
+void TerpstraMidiDriver::resetFaderConfig()
+{
+    sendSysExRequest(0, RESET_FADER_CONFIG);
+}
 
-		}
-		else
-		{
-			memmove(&sysExData[5], velocityTable, 128);
-		}
+// CMD 0Eh: Enable or disable aftertouch functionality
+void TerpstraMidiDriver::sendAfterTouchActivation(bool value)
+{
+    sendSysExToggle(0, SET_AFTERTOUCH_FLAG, value);
+}
 
-		MidiMessage msg = MidiMessage::createSysExMessage(sysExData, 133);
-		sendMessageNow(msg);
-	}
+// CMD 0Fh: Initiate aftertouch calibration routine
+void TerpstraMidiDriver::sendCalibrateAfterTouch()
+{
+    sendSysExRequest(0, CALIBRATE_AFTERTOUCH);
 }
 
-void TerpstraMidiDriver::sendVelocityIntervalConfig(int velocityIntervalTable[])
+// CMD 10h: Adjust the internal aftertouch look-up table (size of 128)
+void TerpstraMidiDriver::sendAftertouchConfig(const uint8 aftertouchTable[])
 {
-	if (midiOutput != nullptr)
-	{
-		unsigned char sysExData[259];
-		sysExData[0] = (manufacturerId >> 16) & 0xff;
-		sysExData[1] = (manufacturerId >> 8) & 0xff;
-		sysExData[2] = manufacturerId & 0xff;
-		sysExData[3] = '\0';
-        sysExData[4] = SET_VELOCITY_INTERVALS;
-
-        // Interval table contains 127 values!
-		for ( int i = 0; i < VELOCITYINTERVALTABLESIZE; i++)
-        {
-            sysExData[5 + 2*i] = velocityIntervalTable[i] >> 6;
-            sysExData[6 + 2*i] = velocityIntervalTable[i] & 0x3f;
-        }
+    MidiMessage msg = sendTableSysEx(0, SET_AFTERTOUCH_CONFIG, 128, aftertouchTable);
+    sendMessageWithAcknowledge(msg);
+}
 
-		MidiMessage msg = MidiMessage::createSysExMessage(sysExData, 261);
-		sendMessageNow(msg);
-	}
+// CMD 11h: **DEPRECATED** Save the changes made to the aftertouch look-up table
+void TerpstraMidiDriver::saveAftertouchConfig()
+{
+    sendSysExRequest(0, SAVE_AFTERTOUCH_CONFIG);
 }
 
-// Save velocity config to EEPROM
-void TerpstraMidiDriver::saveVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType)
+// CMD 12h: Reset the aftertouch lookup table back to its factory aftertouch settings.
+void TerpstraMidiDriver::resetAftertouchConfig()
 {
-    switch(velocityCurveType)
-    {
-        case TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff:
-            sendSysEx(0, SAVE_VELOCITY_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-        case TerpstraVelocityCurveConfig::VelocityCurveType::fader:
-            sendSysEx(0, SAVE_FADER_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-        case TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch:
-            sendSysEx(0, SAVE_AFTERTOUCH_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-		case TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch:
-			sendSysEx(0, SAVE_LUMATOUCH_CONFIG, '\0', '\0', '\0', '\0');
-			break;
-		default:
-            jassert(false);
-            break;
-    }
+    sendSysExRequest(0, RESET_AFTERTOUCH_CONFIG);
+}
+
+// CMD 13h: Read back the current red intensity of all the keys of the target board.
+void TerpstraMidiDriver::sendRedLEDConfigRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_RED_LED_CONFIG);
+}
+
+// CMD 14h: Read back the current green intensity of all the keys of the target board.
+void TerpstraMidiDriver::sendGreenLEDConfigRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_GREEN_LED_CONFIG);
+}
+
+// CMD 15h: Read back the current blue intensity of all the keys of the target board.
+void TerpstraMidiDriver::sendBlueLEDConfigRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_BLUE_LED_CONFIG);
+}
+
+// CMD 16h: Read back the current channel configuration of all the keys of the target board.
+void TerpstraMidiDriver::sendChannelConfigRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_CHANNEL_CONFIG);
+}
+
+// CMD 17h: Read back the current note configuration of all the keys of the target board.
+void TerpstraMidiDriver::sendNoteConfigRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_NOTE_CONFIG);
+}
+
+// CMD 18h: Read back the current key type configuration of all the keys of the target board.
+void TerpstraMidiDriver::sendKeyTypeConfigRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_KEYTYPE_CONFIG);
+}
+
+// CMD 19h: Read back the maximum threshold of all the keys of the target board.
+void TerpstraMidiDriver::sendMaxFaderThresholdRequest(uint8 boardIndex)
+{
+    sendSysExRequest(0, GET_MAX_THRESHOLD);
+}
+
+// CMD 1Ah: Read back the maximum threshold of all the keys of the target board
+void TerpstraMidiDriver::sendMinFaderThresholdRequest(uint8 boardIndex)
+{
+    sendSysExRequest(0, GET_MIN_THRESHOLD);
+}
+
+// CMD 1Bh: Read back the aftertouch maximum threshold of all the keys of the target board
+void TerpstraMidiDriver::sendMaxAftertouchThresholdRequest(uint8 boardIndex)
+{
+    sendSysExRequest(0, GET_AFTERTOUCH_MAX);
+}
+
+// CMD 1Ch: Get back flag whether or not each key of target board meets minimum threshold
+void TerpstraMidiDriver::sendKeyValidityParametersRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_KEY_VALIDITY);
+}
+
+// CMD 1Dh: Read back the current velocity look up table of the keyboard.
+void TerpstraMidiDriver::sendVelocityConfigRequest()
+{
+    sendSysExRequest(0, GET_VELOCITY_CONFIG);
+}
+
+// CMD 1Eh: Read back the current fader look up table of the keyboard.
+void TerpstraMidiDriver::sendFaderConfigRequest()
+{
+    sendSysExRequest(0, GET_FADER_CONFIG);
 }
 
-// reset velocity config to value from EEPROM
-void TerpstraMidiDriver::resetVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType)
+// CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
+void TerpstraMidiDriver::sendAftertouchConfigRequest()
 {
-    switch(velocityCurveType)
+    sendSysExRequest(0, GET_AFTERTOUCH_CONFIG);
+}
+
+// CMD 20h: Set the velocity interval table, 127 12-bit values
+void TerpstraMidiDriver::sendVelocityIntervalConfig(const int velocityIntervalTable[])
+{
+    const int payloadSize = 254;
+    uint8 formattedTable[payloadSize];
+
+    // Interval table contains 127 values!
+	for (uint8 i = 0; i < VELOCITYINTERVALTABLESIZE; i++)
     {
-        case TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff:
-            sendSysEx(0, RESET_VELOCITY_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-        case TerpstraVelocityCurveConfig::VelocityCurveType::fader:
-            sendSysEx(0, RESET_FADER_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-        case TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch:
-            sendSysEx(0, RESET_AFTERTOUCH_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-		case TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch:
-			sendSysEx(0, RESET_LUMATOUCH_CONFIG, '\0', '\0', '\0', '\0');
-			break;
-		default:
-            jassert(false);
-            break;
+        formattedTable[2*i]     = (velocityIntervalTable[i] >> 6) & 0x3f;
+        formattedTable[1 + 2*i] = velocityIntervalTable[i] & 0x3f;
     }
+
+	MidiMessage msg = sendTableSysEx(0, SET_VELOCITY_INTERVALS, payloadSize, formattedTable);
+	sendMessageWithAcknowledge(msg);
 }
 
-// Enable or disable aftertouch functionality
-void TerpstraMidiDriver::sendAfterTouchActivation(bool value)
+// CMD 21h: Sead back the velocity interval table
+void TerpstraMidiDriver::sendVelocityIntervalConfigRequest()
 {
-	sendSysEx(0, SET_AFTERTOUCH_FLAG, value ? '\1' : '\0', '\0', '\0', '\0');
+    sendSysExRequest(0, GET_VELOCITY_INTERVALS);
 }
 
-// Initiate aftertouch calibration routine
-void TerpstraMidiDriver::sendCalibrateAfterTouch()
+// CMD 22h: Read back the fader type of all keys on the targeted board.
+void TerpstraMidiDriver::sendFaderTypeConfigRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_FADER_TYPE_CONFIGURATION);
+}
+
+// CMD 23h: This command is used to read back the serial identification number of the keyboard.
+void TerpstraMidiDriver::sendGetSerialIdentityRequest(int sendToTestDevice)
 {
-	sendSysEx(0, CALIBRATE_AFTERTOUCH, '\0', '\0', '\0', '\0');
+    if (sendToTestDevice < 0)
+        sendSysEx(0, GET_SERIAL_IDENTITY, TEST_ECHO, '\0', '\0', '\0');
+    else if (sendToTestDevice < midiOutputs.size())
+        sendTestMessageNow(sendToTestDevice, createTerpstraSysEx(0, GET_SERIAL_IDENTITY, TEST_ECHO, '\0', '\0', '\0'));
 }
 
+// CMD 24h: Initiate the key calibration routine; each pair of macro buttons  
+// on each octave must be pressed to return to normal state
 void TerpstraMidiDriver::sendCalibrateKeys()
 {
-	sendSysEx(0, CALIBRATE_KEYS, '\0', '\0', '\0', '\0');
+    sendSysExRequest(0, CALIBRATE_KEYS);
 }
 
+// CMD 25h: Pass in true to enter Demo Mode, or false to exit
+void TerpstraMidiDriver::startDemoMode(bool turnOn)
+{
+    sendSysExToggle(0, DEMO_MODE, turnOn);
+}
+
+// CMD 26h: Initiate the pitch and mod wheel calibration routine, pass in false to stop
 void TerpstraMidiDriver::sendCalibratePitchModWheel(bool startCalibration)
 {
-	sendSysEx(0, CALIBRATE_PITCH_MOD_WHEEL, startCalibration ? '\1' : '\0', '\0', '\0', '\0');
+    sendSysExToggle(0, CALIBRATE_PITCH_MOD_WHEEL, startCalibration);
+}
+
+// CMD 27h: Set the sensitivity value of the mod wheel, 0x01 to 0x07f
+void TerpstraMidiDriver::setModWheelSensitivity(uint8 sensitivity)
+{
+    if (sensitivity > 0x7f) sensitivity &= 0x7f;  // Restrict to upper bound
+    if (sensitivity < 0x01) sensitivity  = 0x01;  // Restrict to lower bound
 
+    sendSysEx(0, SET_MOD_WHEEL_SENSITIVITY, sensitivity, '\0', '\0', '\0');
 }
 
-void TerpstraMidiDriver::sendRedLEDConfigurationRequest(int boardIndex)
+// CMD 28h: Set the sensitivity value of the pitch bend wheel between 0x01 and 0x3FFF
+void TerpstraMidiDriver::setPitchBendSensitivity(int sensitivity)
 {
-    sendSysEx(boardIndex, GET_RED_LED_CONFIG, '\0', '\0', '\0', '\0');
+    if (sensitivity > 0x3fff) sensitivity &= 0x3fff; // Restrict to upper bound
+    if (sensitivity < 0x0001) sensitivity  = 0x0001;  // Restrict to lower bound
+
+    sendSysEx(0, SET_PITCH_WHEEL_SENSITIVITY, sensitivity >> 7, sensitivity & 0x7f, '\0',  '\0');
 }
 
-void TerpstraMidiDriver::sendGreenLEDConfigurationRequest(int boardIndex)
+// CMD 29h: Set abs. distance from max value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+void TerpstraMidiDriver::setKeyMaximumThreshold(uint8 boardIndex, uint8 maxThreshold, uint8 aftertouchMax)
 {
-    sendSysEx(boardIndex, GET_GREEN_LED_CONFIG, '\0', '\0', '\0', '\0');
+    if (maxThreshold  > 0xfe) maxThreshold  &= 0xfe;
+    if (aftertouchMax > 0xfe) aftertouchMax &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_MAX_THRESHOLD, maxThreshold >> 4, maxThreshold & 0xf, aftertouchMax >> 4, aftertouchMax & 0xf);
 }
 
-void TerpstraMidiDriver::sendBlueLEDConfigurationRequest(int boardIndex)
+// CMD 2Ah: Set abs. distance from min value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+void TerpstraMidiDriver::setKeyMinimumThreshold(uint8 boardIndex, uint8 minThresholdHigh, uint8 minThresholdLow)
 {
-    sendSysEx(boardIndex, GET_BLUE_LED_CONFIG, '\0', '\0', '\0', '\0');
+    if (minThresholdHigh > 0xfe) minThresholdHigh &= 0xfe;
+    if (minThresholdLow  > 0xfe) minThresholdLow  &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_MIN_THRESHOLD, minThresholdHigh >> 4, minThresholdHigh & 0xf, minThresholdLow >> 4, minThresholdLow & 0xf);
 }
 
-void TerpstraMidiDriver::sendChannelConfigurationRequest(int boardIndex)
+// CMD 2Bh: Set the sensitivity for CC events, ranging from 0x00 to 0xFE
+void TerpstraMidiDriver::setFaderKeySensitivity(uint8 boardIndex, uint8 sensitivity)
 {
-    sendSysEx(boardIndex, GET_CHANNEL_CONFIG, '\0', '\0', '\0', '\0');
+    if (sensitivity > 0xfe) sensitivity &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_FADER_SENSITIVITY, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
 }
 
-void TerpstraMidiDriver::sendNoteConfigurationRequest(int boardIndex)
+// CMD 2Ch: Set the target board sensitivity for aftertouch events, ranging from 0x00 to 0xFE
+void TerpstraMidiDriver::setAftertouchKeySensitivity(uint8 boardIndex, uint8 sensitivity)
 {
-    sendSysEx(boardIndex, GET_NOTE_CONFIG, '\0', '\0', '\0', '\0');
+    if (sensitivity > 0xfe) sensitivity &= 0xfe;
+    sendSysEx(boardIndex, SET_KEY_AFTERTOUCH_SENSITIVITY, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
 }
 
-void TerpstraMidiDriver::sendKeyTypeConfigurationRequest(int boardIndex)
+// CMD 2Dh: Adjust the Lumatouch table, a 128 byte array with value of 127 being a key fully pressed
+void TerpstraMidiDriver::setLumatouchConfig(const uint8 lumatouchTable[])
 {
-    sendSysEx(boardIndex, GET_KEYTYPE_CONFIG, '\0', '\0', '\0', '\0');
+    MidiMessage msg = sendTableSysEx(0, SET_LUMATOUCH_CONFIG, 128, lumatouchTable);
+    sendMessageWithAcknowledge(msg);
+}
 
+// CMD 2Eh: **DEPRECATED** Save Lumatouch table changes
+void TerpstraMidiDriver::saveLumatoneConfig()
+{
+    sendSysExRequest(0, SAVE_LUMATOUCH_CONFIG);
 }
 
-void TerpstraMidiDriver::sendVelocityConfigurationRequest(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType)
+// CMD 2Fh: Reset the Lumatouch table back to factory settings
+void TerpstraMidiDriver::resetLumatouchConfig()
 {
-    switch(velocityCurveType)
-    {
-        case TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff:
-            sendSysEx(0, GET_VELOCITY_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-        case TerpstraVelocityCurveConfig::VelocityCurveType::fader:
-            sendSysEx(0, GET_FADER_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-        case TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch:
-            sendSysEx(0, GET_AFTERTOUCH_CONFIG, '\0', '\0', '\0', '\0');
-            break;
-		case TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch:
-			sendSysEx(0, GET_LUMATOUCH_CONFIG, '\0', '\0', '\0', '\0');
-			break;
-		default:
-            jassert(false);
-            break;
-    }
+    sendSysExRequest(0, RESET_LUMATOUCH_CONFIG);
+}
+
+// CMD 30h: Read back the Lumatouch table
+void TerpstraMidiDriver::sendLumatouchConfigRequest()
+{
+    sendSysExRequest(0, GET_LUMATOUCH_CONFIG);
 }
 
+// CMD 31h: This command is used to read back the current Lumatone firmware revision.
+void TerpstraMidiDriver::sendGetFirmwareRevisionRequest(int sendToTestDevice)
+{
+    if (sendToTestDevice < 0)
+        sendSysExRequest(0, GET_FIRMWARE_REVISION);
+    else if (sendToTestDevice < midiInputs.size())
+        sendTestMessageNow(sendToTestDevice, createTerpstraSysEx(0, GET_FIRMWARE_REVISION, TEST_ECHO, '\0', '\0', '\0'));
+}
 
-void TerpstraMidiDriver::sendVelocityIntervalConfigRequest()
+// CMD 32h: Set the thresold from key’s min value to trigger CA - 004 submodule CC events, ranging from 0x00 to 0xFE
+void TerpstraMidiDriver::setCCActiveThreshold(uint8 boardIndex, uint8 sensitivity)
 {
-    sendSysEx(0, GET_VELOCITY_INTERVALS, '\0', '\0', '\0', '\0');
+    if (sensitivity > 0xfe) sensitivity &= 0xfe;
+    sendSysEx(boardIndex, SET_CC_ACTIVE_THRESHOLD, sensitivity >> 4, sensitivity & 0xf, '\0', '\0');
 }
 
-void TerpstraMidiDriver::sendGetSerialIdentityRequest(bool overrideEditMode)
+// CMD 33h: Echo the payload, 0x00-0x7f, for use in connection monitoring
+// the first 7-bit value is reserved for echo differentiation
+void TerpstraMidiDriver::ping(uint8 value1, uint8 value2, uint8 value3, int sendToTestDevice)
 {
-    sendSysEx(0, GET_SERIAL_IDENTITY, '\0', '\0', '\0', '\0', overrideEditMode);
+    if (value1 > 0x7f) value1 &= 0x7f;
+    if (value2 > 0x7f) value2 &= 0x7f;
+    if (value3 > 0x7f) value3 &= 0x7f;
+
+    if (sendToTestDevice < 0)
+        sendSysEx(0, LUMA_PING, TEST_ECHO, value1, value2, value3);
+    else if (sendToTestDevice < midiOutputs.size())
+        sendTestMessageNow(sendToTestDevice, createTerpstraSysEx(0, LUMA_PING, TEST_ECHO, value1, value2, value3));
 }
 
-MidiMessage TerpstraMidiDriver::getSerialIdentityRequestMessage() const
+// CMD 33h: Echo the payload, 0x00-0x7f, for use in connection monitoring
+unsigned int TerpstraMidiDriver::ping(unsigned int value, int sendToTestDevice)
 {
-    MidiMessage msg = createTerpstraSysEx(0, GET_SERIAL_IDENTITY, '\0', '\0', '\0', '\0');
-    return msg;
+    value &= 0xFFFFFFF; // Limit 28-bits
+    ping((value >> 14) & 0x7f, (value >> 7) & 0x7f, value & 0x7f, sendToTestDevice);
+    return value;
 }
 
-void TerpstraMidiDriver::sendGetFirmwareRevisionRequest(bool overrideEditMode)
+// CMD 34h: Reset the thresholds for events and sensitivity for CC & aftertouch on the target board
+void TerpstraMidiDriver::resetBoardThresholds(uint8 boardIndex)
 {
-    sendSysEx(0, GET_FIRMWARE_REVISION, '\0', '\0', '\0', '\0', overrideEditMode);
+    sendSysExRequest(boardIndex, RESET_BOARD_THRESHOLDS);
 }
 
-MidiMessage TerpstraMidiDriver::getFirmwareRevisionRequestMessage() const
+// CMD 35h: Enable/disable key sampling over SSH for the target key and board
+void TerpstraMidiDriver::setKeySampling(uint8 boardIndex, uint8 keyIndex, bool turnSamplingOn)
 {
-    MidiMessage msg = createTerpstraSysEx(0, GET_FIRMWARE_REVISION, '\0', '\0', '\0', '\0');
-    return msg;
+    sendSysExToggle(boardIndex, SET_KEY_SAMPLING, turnSamplingOn);
+}
+
+// CMD 36h: Set thresholds for the pitch and modulation wheel to factory settings
+void TerpstraMidiDriver::resetWheelsThresholds()
+{
+    sendSysExRequest(0, RESET_WHEELS_THRESHOLD);
+}
+
+// CMD 37h: Set the bounds from the calibrated zero adc value of the pitch wheel, 0x00 to 0x7f
+void TerpstraMidiDriver::setPitchWheelZeroThreshold(uint8 threshold)
+{
+    if (threshold > 0x7f) threshold &= 0x7f;
+    sendSysEx(0, SET_PITCH_WHEEL_CENTER_THRESHOLD, threshold, '\0', '\0', '\0');
+}
+
+// CMD 38h: Pass in true to initiate the expression pedal calibration routine, or false to stop
+void TerpstraMidiDriver::calibrateExpressionPedal(bool startCalibration)
+{
+    sendSysExToggle(0, CALLIBRATE_EXPRESSION_PEDAL, startCalibration);
+}
+
+// CMD 39h: Reset expression pedal minimum and maximum bounds to factory settings
+void TerpstraMidiDriver::resetExpressionPedalBounds()
+{
+    sendSysExRequest(0, RESET_EXPRESSION_PEDAL_BOUNDS);
+}
+
+// CMD 3Ah: Retrieve the threshold values of target board
+void TerpstraMidiDriver::getBoardThresholdValues(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_BOARD_THRESHOLD_VALUES);
+}
+
+// CMD 3Bh: Retrieve the sensitivity values of target board
+void TerpstraMidiDriver::getBoardSensitivityValues(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_BOARD_SENSITIVITY_VALUES);
+}
+
+// CMD 3Ch: Set the MIDI channels for peripheral controllers
+void TerpstraMidiDriver::setPeripheralChannels(uint8 pitchWheelChannel, uint8 modWheelChannel, uint8 expressionChannel, uint8 sustainChannel)
+{
+    // For now set default channel to 1
+    if (pitchWheelChannel > 0xf) pitchWheelChannel &= 0x00;
+    if (modWheelChannel   > 0xf) modWheelChannel   &= 0x00;
+    if (expressionChannel > 0xf) expressionChannel &= 0x00;
+    if (sustainChannel    > 0xf) sustainChannel    &= 0x00;
+
+    sendSysEx(0, SET_PERIPHERAL_CHANNELS, pitchWheelChannel, modWheelChannel, expressionChannel, sustainChannel);
+}
+
+// CMD 3Dh: Retrieve the MIDI channels for peripheral controllers
+void TerpstraMidiDriver::getPeripheralChannels()
+{
+    sendSysExRequest(0, GET_PERIPHERAL_CHANNELS);
+}
+
+// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
+void TerpstraMidiDriver::setAfterTouchTriggerDelay(uint8 boardIndex, uint8 aftertouchTriggerValue)
+{
+    setAfterTouchTriggerDelay(boardIndex, aftertouchTriggerValue >> 4, aftertouchTriggerValue & 0xf);
+}
+
+// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
+void TerpstraMidiDriver::setAfterTouchTriggerDelay(uint8 boardIndex, uint8 triggerValueUpperNibble, uint8 triggerValueLowerNibble)
+{
+    sendSysEx(boardIndex, SET_AFTERTOUCH_TRIGGER_DELAY, triggerValueUpperNibble, triggerValueLowerNibble, '\0', '\0');
+}
+
+// CMD 40h: Retrieve the aftertouch trigger delay of the given board
+void TerpstraMidiDriver::sendGetAftertouchTriggerDelayRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_AFTERTOUCH_TRIGGER_DELAY);
+}
+
+// CMD 41h: Set the Lumatouch note-off delay value, an 11-bit integer representing the amount of 1.1ms ticks before
+// sending a note-off event after a Lumatone-configured key is released. 
+void TerpstraMidiDriver::setLumatouchNoteOffDelay(uint8 boardIndex, int delayValue)
+{
+    setLumatouchNoteOffDelay(boardIndex,
+        (delayValue >> 8) & 0xf,
+        (delayValue >> 4) & 0xf,
+        delayValue & 0xf
+    );
+}
+
+void TerpstraMidiDriver::setLumatouchNoteOffDelay(uint8 boardIndex, uint8 valueBits8_11, uint8 valueBits4_7, uint8 valueBits0_3)
+{
+    sendSysEx(boardIndex, SET_LUMATOUCH_NOTE_OFF_DELAY, valueBits8_11, valueBits4_7, valueBits0_3, '\0');
+}
+
+// CMD 42h: Retrieve the note-off delay value of the given board
+void TerpstraMidiDriver::sendGetLumatouchNoteOffDelayRequest(uint8 boardIndex)
+{
+    sendSysExRequest(boardIndex, GET_LUMATOUCH_NOTE_OFF_DELAY);
+}
+
+// CMD 43h: Set expression pedal ADC threshold value, a 12-bit integer
+void TerpstraMidiDriver::setExpressionPedalADCThreshold(int thresholdValue)
+{
+    setExpressionPedalADCThreshold(
+        (thresholdValue >> 8) & 0xf,
+        (thresholdValue >> 4) & 0xf,
+        thresholdValue & 0xf
+    );
+}
+
+// CMD 43h: Set expression pedal ADC threshold value with 3 4-bit integers representing a 12-bit integer
+void TerpstraMidiDriver::setExpressionPedalADCThreshold(uint8 valueBits8_12, uint8 valueBits4_7, uint8 valueBits0_3)
+{
+    sendSysEx(0, SET_EXPRESSION_PEDAL_THRESHOLD, valueBits8_12, valueBits4_7, valueBits0_3, '\0');
+}
+
+// CMD 44h: Get the current expression pedal ADC threshold value
+void TerpstraMidiDriver::sendGetExpressionPedalADCThresholdRequest()
+{
+    sendSysExRequest(0, GET_EXPRESSION_PEDAL_THRESHOLD);
+}
+
+void TerpstraMidiDriver::sendInvertSustainPedal(bool setInverted)
+{
+    sendSysExToggle(0, INVERT_SUSTAIN_PEDAL, setInverted);
 }
 
 /*
@@ -359,12 +621,17 @@ MidiMessage TerpstraMidiDriver::getFirmwareRevisionRequestMessage() const
 Low-level SysEx calls
 */
 
-MidiMessage TerpstraMidiDriver::createTerpstraSysEx(int boardIndex, unsigned char cmd, unsigned char data1, unsigned char data2, unsigned char data3, unsigned char data4) const
+void TerpstraMidiDriver::fillManufacturerId(unsigned char* data) const
+{
+    data[0] = MANUFACTURER_ID_0;
+    data[1] = MANUFACTURER_ID_1;
+    data[2] = MANUFACTURER_ID_2;
+}
+
+MidiMessage TerpstraMidiDriver::createTerpstraSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4) const
 {
     unsigned char sysExData[9];
-    sysExData[0] = (manufacturerId >> 16) & 0xff;
-    sysExData[1] = (manufacturerId >> 8) & 0xff;
-    sysExData[2] = manufacturerId & 0xff;
+    fillManufacturerId(sysExData);
     sysExData[3] = boardIndex;
     sysExData[4] = cmd;
     sysExData[5] = data1;
@@ -376,16 +643,208 @@ MidiMessage TerpstraMidiDriver::createTerpstraSysEx(int boardIndex, unsigned cha
     return msg;
 }
 
-void TerpstraMidiDriver::sendSysEx(int boardIndex, unsigned char cmd, unsigned char data1, unsigned char data2, unsigned char data3, unsigned char data4, bool overrideEditMode)
+// Create a SysEx message to send 8-bit color precision
+MidiMessage TerpstraMidiDriver::createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const
 {
-	// Send only if output device is there and SysEx sending is meant to be active
-	if ((midiOutput != nullptr && currentSysExSendingMode == sysExSendingMode::liveEditor) || overrideEditMode)
-	{
+    unsigned char sysExData[12];
+    fillManufacturerId(sysExData);
+    sysExData[3] = boardIndex;
+    sysExData[4] = cmd;
+    sysExData[5] = keyIndex;
+    sysExData[6] = redUpper;
+    sysExData[7] = redLower;
+    sysExData[8] = greenUpper;
+    sysExData[9] = greenLower;
+    sysExData[10] = blueUpper;
+    sysExData[11] = blueLower;
+
+    MidiMessage msg = MidiMessage::createSysExMessage(sysExData, 12);
+    return msg;
+}
+MidiMessage TerpstraMidiDriver::createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, int red, int green, int blue) const
+{
+    return createExtendedKeyColourSysEx(boardIndex, cmd, keyIndex, red >> 4, red & 0xf, green >> 4, green & 0xf, blue >> 4, blue & 0xf);
+}
+
+MidiMessage TerpstraMidiDriver::createExtendedMacroColourSysEx(uint8 cmd, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const
+{
+    unsigned char sysExData[11];
+    fillManufacturerId(sysExData);
+    sysExData[3] = 0;
+    sysExData[4] = cmd;
+    sysExData[5] = redUpper;
+    sysExData[6] = redLower;
+    sysExData[7] = greenUpper;
+    sysExData[8] = greenLower;
+    sysExData[9] = blueUpper;
+    sysExData[10] = blueLower;
+
+    MidiMessage msg = MidiMessage::createSysExMessage(sysExData, 11);
+    return msg;
+}
+
+MidiMessage TerpstraMidiDriver::createExtendedMacroColourSysEx(uint8 cmd, int red, int green, int blue) const
+{
+    return createExtendedMacroColourSysEx(cmd, red >> 4, red & 0xf, green >> 4, green & 0xf, blue >> 4, blue & 0xf);
+}
+
+MidiMessage TerpstraMidiDriver::sendTableSysEx(uint8 boardIndex, uint8 cmd, uint8 tableSize, const uint8 table[])
+{
+    size_t msgSize = tableSize + 5;
+    Array<unsigned char> dataArray;
+    dataArray.resize(msgSize);
+
+    auto sysExData = dataArray.getRawDataPointer();
+    fillManufacturerId(sysExData);
+
+    sysExData[3] = '\0';
+    sysExData[4] = cmd;
+
+    memmove(&sysExData[5], table, sizeof(uint8) * tableSize);
+
+    //DEBUG
+    for (int i = 0; i < tableSize; i++)
+        jassert(table[i] <= 0x7f);
+
+    auto msg = MidiMessage::createSysExMessage(sysExData, msgSize);
+    sendMessageWithAcknowledge(msg);
+
+    return msg;
+}
+
+void TerpstraMidiDriver::sendSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4, bool overrideEditMode)
+{
+    if (midiInput != nullptr)
+    {
+        jassert(boardIndex < 0x6 && cmd <= 0x44 && data1 <= 0x7f && data2 <= 0x7f && data3 <= 0x7f && data4 <= 0x7f);
         MidiMessage msg = createTerpstraSysEx(boardIndex, cmd, data1, data2, data3, data4);
-		sendMessageWithAcknowledge(msg);
-	}
+        sendMessageWithAcknowledge(msg);
+    }
+}
+
+// Send a SysEx message without parameters
+void TerpstraMidiDriver::sendSysExRequest(uint8 boardIndex, uint8 cmd)
+{
+    unsigned char sysExData[9];
+    fillManufacturerId(sysExData);
+    sysExData[3] = boardIndex;
+    sysExData[4] = cmd;
+    sysExData[5] = '\0';
+    sysExData[6] = '\0';
+    sysExData[7] = '\0';
+    sysExData[8] = '\0';
+    auto msg = MidiMessage::createSysExMessage(sysExData, 9);
+    sendMessageWithAcknowledge(msg);
+}
+
+void TerpstraMidiDriver::sendSysExToggle(uint8 boardIndex, uint8 cmd, bool turnStateOn)
+{
+    unsigned char sysExData[9];
+    fillManufacturerId(sysExData);
+    sysExData[3] = boardIndex;
+    sysExData[4] = cmd;
+    sysExData[5] = turnStateOn;
+    sysExData[6] = '\0';
+    sysExData[7] = '\0';
+    sysExData[8] = '\0';
+    auto msg = MidiMessage::createSysExMessage(sysExData, 9);
+    sendMessageWithAcknowledge(msg);
+}
+
+// Checks if message is a valid Lumatone firmware response and is expected length, then runs supplied unpacking function or returns an error code 
+FirmwareSupport::Error TerpstraMidiDriver::unpackIfValid(const MidiMessage& response, size_t numBytes, std::function<FirmwareSupport::Error(const uint8*)> unpackFunction)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, numBytes);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    return unpackFunction(&response.getSysExData()[PAYLOAD_INIT]);
+}
+
+// Generic unpacking of octave data from a SysEx message
+FirmwareSupport::Error TerpstraMidiDriver::unpackOctaveConfig(const MidiMessage& msg, int& boardId, size_t numBytes, int* keyData, std::function<FirmwareSupport::Error(const MidiMessage&, size_t, int*)> nBitUnpackFunction)
+{
+    auto status = nBitUnpackFunction(msg, numBytes, keyData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    boardId = msg.getSysExData()[BOARD_IND];
+    return status;
+}
+
+// Generic unpacking of 7-bit data from a SysEx message
+FirmwareSupport::Error TerpstraMidiDriver::unpack7BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const uint8* payload) {
+        for (int i = 0; i < numBytes; i++)
+            unpackedData[i] = payload[i];
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
+}
+
+// Unpacking of octave-based 7-bit key configuration data
+FirmwareSupport::Error TerpstraMidiDriver::unpack7BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData)
+{
+    return unpackOctaveConfig(msg, boardId, numKeys, keyData, [&](const MidiMessage&, uint8, int*) {
+        return unpack7BitData(msg, numKeys, keyData);
+    });
+}
+
+// Generic unpacking of 8-bit data from a SysEx message
+FirmwareSupport::Error TerpstraMidiDriver::unpack8BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const uint8* payload) {
+        auto numValues = numBytes / 2;
+        for (int i = 0; i < numValues; i++)
+            unpackedData[i] = (payload[(i * 2)] << 4) | (payload[(i * 2) + 1]);
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
 }
 
+// Unpacking of octave-based 8-bit data
+FirmwareSupport::Error TerpstraMidiDriver::unpack8BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData)
+{
+    return unpackOctaveConfig(msg, boardId, numKeys, keyData, [&](const MidiMessage&, size_t, int*) {
+        return unpack8BitData(msg, numKeys * 2, keyData);
+    });
+}
+
+// Generic unpacking of 12-bit data from a SysEx message, when packed with two 7-bit values
+FirmwareSupport::Error TerpstraMidiDriver::unpack12BitDataFrom7Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const uint8* payload) {
+        auto numValues = numBytes / 2;
+        for (int i = 0; i < numValues; i++)
+            unpackedData[i] = (payload[i * 2] << 6) | (payload[(i * 2) + 1]);
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
+}
+
+// Generic unpacking of 12-bit data from a SysEx message, when packed with three 4-bit values
+FirmwareSupport::Error TerpstraMidiDriver::unpack12BitDataFrom4Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData)
+{
+    auto unpack = [&](const uint8* payload) {
+        auto numValues = numBytes / 3;
+        for (int i = 0; i < numValues; i++)
+        {
+            int start = i * 3;
+            unpackedData[i] = (payload[start] << 8) | (payload[start + 1] << 4) | (payload[start + 2]);
+        }
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackIfValid(msg, numBytes, unpack);
+}
 bool TerpstraMidiDriver::messageIsResponseToMessage(const MidiMessage& answer, const MidiMessage& originalMessage)
 {
     // Only for SysEx messages
@@ -410,86 +869,396 @@ bool TerpstraMidiDriver::messageIsResponseToMessage(const MidiMessage& answer, c
     }
 }
 
-bool TerpstraMidiDriver::messageIsTerpstraSysExMessage(const MidiMessage& midiMessage)
+FirmwareSupport::Error TerpstraMidiDriver::messageIsValidLumatoneResponse(const MidiMessage& midiMessage)
 {
     if (!midiMessage.isSysEx())
-        return false;
+        return FirmwareSupport::Error::messageIsNotSysEx;
 
     auto sysExData = midiMessage.getSysExData();
 
-    return midiMessage.getSysExDataSize() >= 3 &&
-        (sysExData[0] == ((manufacturerId >> 16) & 0xff)) &&
-        (sysExData[1] == ((manufacturerId >> 8) & 0xff)) &&
-		(sysExData[2] == (manufacturerId & 0xff));
+    if (midiMessage.getSysExDataSize() < PAYLOAD_INIT)
+        return FirmwareSupport::Error::messageTooShort;
+
+    if (!(sysExData[MANU_0] == MANUFACTURER_ID_0) &&
+        !(sysExData[MANU_1] == MANUFACTURER_ID_1) &&
+        !(sysExData[MANU_2] == MANUFACTURER_ID_2))
+        return FirmwareSupport::Error::messageHasIncorrectManufacturerId;
+
+    if (sysExData[BOARD_IND] > BOARD_OCT_5)
+        return FirmwareSupport::Error::messageHasInvalidBoardIndex;
+
+    if (sysExData[MSG_STATUS] > TerpstraMIDIAnswerReturnCode::ERROR)
+        return FirmwareSupport::Error::messageHasInvalidStatusByte;
+
+    return FirmwareSupport::Error::noError;
 }
 
-bool TerpstraMidiDriver::messageIsTerpstraConfigurationDataReceptionMessage(const MidiMessage& midiMessage)
+FirmwareSupport::Error TerpstraMidiDriver::responseIsExpectedLength(const MidiMessage& midiMessage, size_t numPayloadBytes)
 {
-    if (!messageIsTerpstraSysExMessage(midiMessage))
-        return false;
+    auto size = midiMessage.getSysExDataSize();
+    auto expected = numPayloadBytes + PAYLOAD_INIT;
 
-    // sysExData, positions 0-2: manufacturer Id. position 3: board index.
-    auto midiCmd = midiMessage.getSysExData()[4];
+    if (size == expected)
+        return FirmwareSupport::Error::noError;
 
-    return
-        midiCmd == GET_RED_LED_CONFIG ||
-        midiCmd == GET_GREEN_LED_CONFIG ||
-        midiCmd == GET_BLUE_LED_CONFIG ||
-        midiCmd == GET_CHANNEL_CONFIG ||
-        midiCmd == GET_NOTE_CONFIG ||
-        midiCmd == GET_KEYTYPE_CONFIG;
+    else if (size < expected)
+        return FirmwareSupport::Error::messageTooShort;
+
+    else
+        return FirmwareSupport::Error::messageTooLong;
 }
 
-bool TerpstraMidiDriver::messageIsTerpstraVelocityConfigReceptionMessage(const MidiMessage& midiMessage, TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType)
+// For CMD 13h response: unpacks 8-bit key data for red LED intensity. 112 bytes, lower and upper nibbles for 56 values
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetLEDConfigResponse(const MidiMessage& response, int& boardId, int* keyData)
 {
-    if (!messageIsTerpstraSysExMessage(midiMessage))
-        return false;
+    // TODO: Maybe should define keys per octave somewhere
+    return unpack8BitOctaveData(response, boardId, 56, keyData);
+}
+
+// For CMD 13h response: unpacks key data for red LED intensity. 55 or 56 bytes, each value must be multiplied by 5
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetLEDConfigResponse_Version_1_0_0(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
+{
+    // Custom unpacking function for intensity multiplication
+    auto unpackFunction = [&](const uint8* payload) {
+        for (int i = 0; i < numKeys; i++)
+            keyData[i] = ((int)payload[i] * 5) & 0xff;
+        return FirmwareSupport::Error::noError;
+    };
+
+    return unpackOctaveConfig(response, boardId, numKeys, keyData, [&](const MidiMessage&, uint8, int*) {
+        return unpackIfValid(response, numKeys, unpackFunction);
+    });
+}
 
-    // sysExData, positions 0-2: manufacturer Id. position 3: board index.
-    auto midiCmd = midiMessage.getSysExData()[4];
+// For CMD 16h response: unpacks channel data for note configuration. 55 or 56 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetChannelConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
+{
+    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
+}
 
-    return
-        (velocityCurveType == TerpstraVelocityCurveConfig::VelocityCurveType::noteOnNoteOff && midiCmd == GET_VELOCITY_CONFIG) ||
-        (velocityCurveType == TerpstraVelocityCurveConfig::VelocityCurveType::fader && midiCmd == GET_FADER_CONFIG) ||
-        (velocityCurveType == TerpstraVelocityCurveConfig::VelocityCurveType::afterTouch && midiCmd == GET_AFTERTOUCH_CONFIG) ||
-		(velocityCurveType == TerpstraVelocityCurveConfig::VelocityCurveType::lumaTouch && midiCmd == GET_LUMATOUCH_CONFIG);
+// For CMD 17h response: unpacks 7-bit key data for note configuration. 55 or 56 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetNoteConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
+{
+    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
 }
 
-bool TerpstraMidiDriver::messageIsVelocityIntervalConfigReceptionMessage(const MidiMessage& midiMessage)
+// For CMD 18h response: unpacks 7-bit key type data for key configuration. 55 or 56 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetTypeConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
 {
-    if (!messageIsTerpstraSysExMessage(midiMessage))
-        return false;
+    return unpack7BitOctaveData(response, boardId, numKeys, keyData);
+}
 
-    // sysExData, positions 0-2: manufacturer Id. position 3: board index.
-    auto midiCmd = midiMessage.getSysExData()[4];
+// For CMD 19h response: unpacks 8-bit key data for maximums of adc threshold. 55 or 56 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetKeyMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
+{
+    return unpack8BitData(response, numKeys, keyData);
+}
 
-    return midiCmd == GET_VELOCITY_INTERVALS;
+// For CMD 1Ah response: unpacks 8-bit key data for minimums of adc threshold. 55 or 56 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetKeyMinThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
+{
+    return unpack8BitOctaveData(response, boardId, numKeys, keyData);
 }
 
-bool TerpstraMidiDriver::messageIsGetSerialIdentityResponse(const MidiMessage& midiMessage)
+// For CMD 1Bh response: unpacks 8-bit key data for maximums of adc threshold for aftertouch triggering. 55 or 56 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetAftertouchMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData)
 {
-    if (!messageIsTerpstraSysExMessage(midiMessage))
-        return false;
+    return unpack8BitOctaveData(response, boardId, numKeys, keyData);
+}
+
+// For CMD 1Ch response: unpacks boolean key validity data for board, whether or not each key meets threshold specs
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetKeyValidityResponse(const MidiMessage& response, int& boardId, uint8 numKeys, bool* keyValidityData)
+{
+    // TODO: perhaps define boolean unpacking, or combine with 7-bit somehow
 
-    // sysExData, positions 0-2: manufacturer Id. position 3: board index.
-    auto midiCmd = midiMessage.getSysExData()[4];
+    // Custom unpacking function for boolean array
+    auto unpackFunction = [&](const uint8* payload) {
+        for (int i = 0; i < numKeys; i++)
+            keyValidityData[i] = (bool)payload[i];
+        return FirmwareSupport::Error::noError;
+    };
 
-    return midiCmd == GET_SERIAL_IDENTITY;
+    auto status = unpackIfValid(response, numKeys, unpackFunction);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    boardId = response.getSysExData()[BOARD_IND];
+    return status;
 }
 
-bool TerpstraMidiDriver::messageIsGetFirmwareRevisionResponse(const MidiMessage& midiMessage)
+// For CMD 1Dh response: unpacks 7-bit velocity configuration of keyboard, 128 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetVelocityConfigResponse(const MidiMessage& response, int* velocityData)
 {
-    if (!messageIsTerpstraSysExMessage(midiMessage))
-        return false;
+    return unpack7BitData(response, 128, velocityData);
+}
+
+// For CMD 1Eh response: unpacks 7-bit fader configuration of keyboard, 128 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetFaderConfigResponse(const MidiMessage& response, int* faderData)
+{
+    return unpack7BitData(response, 128, faderData);
+}
 
-    // sysExData, positions 0-2: manufacturer Id. position 3: board index.
-    auto midiCmd = midiMessage.getSysExData()[4];
+// For CMD 1Fh response: unpacks 7-bit aftertouch configuration of keyboard, 128 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetAftertouchConfigResponse(const MidiMessage& response, int* aftertouchData)
+{
+    return unpack7BitData(response, 128, aftertouchData);
+}
+
+// For CMD 21h response: unpacks 12-bit velocity interval configuration of keyboard, 254 bytes encoding 127 values
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetVelocityIntervalConfigResponse(const MidiMessage& response, int* intervalData)
+{
+    return unpack12BitDataFrom7Bit(response, 254, intervalData);
+}
 
-    return midiCmd == GET_FIRMWARE_REVISION;
+// For CMD 22h response: unpacks 7-bit fader type configuration of board, 56 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetFaderConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* faderData)
+{
+    return unpackOctaveConfig(response, boardId, numKeys, faderData, [&](const MidiMessage&, size_t, int*) {
+        return unpack7BitData(response, numKeys, faderData);
+    });
+}
+
+// For CMD 23h response: unpacks serial ID number of keyboard, 12 7-bit values encoding 6 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetSerialIdentityResponse(const MidiMessage& response, int* serialBytes)
+{
+    // Check for echo first
+    auto sysExData = response.getSysExData();
+    if (sysExData[MSG_STATUS] == TEST_ECHO)
+        return FirmwareSupport::Error::messageIsAnEcho;
+    
+    auto errorCode = FirmwareSupport::Error::noError;
+
+    if (response.getSysExDataSize() == 18)
+        errorCode = unpack8BitData(response, 12, serialBytes);
+    else if (response.getSysExDataSize() < 18)
+    {
+        // Early firmware versions don't send serial payload
+        errorCode = messageIsValidLumatoneResponse(response);
+        if (errorCode == FirmwareSupport::Error::noError)
+        {
+            for (uint8 i = 0; i < 6; i++)
+                serialBytes[i] = 0;
+        }
+    }
+    else
+        errorCode = FirmwareSupport::Error::messageTooLong;
+
+    return errorCode;
+}
+
+// For CMD 30h response: unpacks 7-bit Lumatouch configuration of keyboard, 128 bytes
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetLumatouchConfigResponse(const MidiMessage& response, int* lumatouchData)
+{
+    return unpack7BitData(response, 128, lumatouchData);
+}
+
+// For CMD 31h response: unpacks firmware revision running on the keyboard
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetFirmwareRevisionResponse(const MidiMessage& response, int& majorVersion, int& minorVersion, int& revision)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 3);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &response.getSysExData()[PAYLOAD_INIT];
+    majorVersion = payload[0];
+    minorVersion = payload[1];
+    revision     = payload[2];
+
+    return status;
+}
+
+// For CMD 33h response: echo payload
+FirmwareSupport::Error TerpstraMidiDriver::unpackPingResponse(const MidiMessage& response, int& value1, int& value2, int& value3, int& value4)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 4);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &response.getSysExData()[PAYLOAD_INIT];
+    value1 = payload[0];
+    value2 = payload[1];
+    value3 = payload[2];
+    value4 = payload[3];
+
+    return status;
+}
+
+// For CMD 33h response: echo payload
+FirmwareSupport::Error TerpstraMidiDriver::unpackPingResponse(const MidiMessage& response, unsigned int& value)
+{
+    // Check for echo first
+    auto sysExData = response.getSysExData();
+    if (sysExData[MSG_STATUS] == TEST_ECHO)
+        return FirmwareSupport::Error::messageIsAnEcho;
+    
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 4);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &sysExData[PAYLOAD_INIT];
+    value = (payload[1] << 14) | (payload[2] << 7) | (payload[3]);
+
+    return status;
+}
+
+// For CMD 3Ah response: retrieve all 8-bit threshold values of a certain board
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetBoardThresholdValuesResponse(const MidiMessage& response, int& boardId, int& minHighThreshold, int& minLowThreshold, int& maxThreshold, int& aftertouchThreshold, int& ccThreshold)
+{
+    const short NUM_UNPACKED = 5;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack8BitOctaveData(response, boardId, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    minHighThreshold     = unpackedData[0];
+    minLowThreshold      = unpackedData[1];
+    maxThreshold         = unpackedData[2];
+    aftertouchThreshold  = unpackedData[3];
+    ccThreshold          = unpackedData[4];
+
+    return status;
+}
+
+// For CMD 3Bh response: retrieve all threshold values of a certain board
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetBoardSensitivityValuesResponse(const MidiMessage& response, int& boardId, int& ccSensitivity, int& aftertouchSensitivity)
+{
+    const short NUM_UNPACKED = 2;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack8BitOctaveData(response, boardId, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    ccSensitivity           = unpackedData[0];
+    aftertouchSensitivity   = unpackedData[1];
+
+    return status;
+}
+
+// For CMD 3Dh response: retrieve all threshold values of a certain board
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetPeripheralChannelsResponse(const MidiMessage& response, int& pitchWheelChannel, int& modWheelChannel, int& expressionChannel, int& sustainPedalChannel)
+{
+    const short NUM_UNPACKED = 4;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack7BitData(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    pitchWheelChannel   = unpackedData[0];
+    modWheelChannel     = unpackedData[1];
+    expressionChannel   = unpackedData[2];
+    sustainPedalChannel = unpackedData[3];
+
+    return status;
+}
+
+// For CMD 3Eh response: retrieve 12-bit expression pedal calibration status values in respective mode, automatically sent every 100ms
+FirmwareSupport::Error TerpstraMidiDriver::unpackExpressionPedalCalibrationPayload(const MidiMessage& response, int& minBound, int& maxBound, bool& valid)
+{
+    const short NUM_UNPACKED = 5; // Actually two + boolean, but this message always returns 15-byte payload
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack12BitDataFrom4Bit(response, 15, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    minBound = unpackedData[0];
+    maxBound = unpackedData[1];
+    valid = response.getSysExData()[PAYLOAD_INIT + 3];
+    
+    return status;
+}
+
+// For CMD 3Eh response: retrieve 12-bit pitch & mod wheel calibration status values in respective mode, automatically sent every 100ms
+FirmwareSupport::Error TerpstraMidiDriver::unpackWheelsCalibrationPayload(const MidiMessage& response, int& centerPitch, int& minPitch, int& maxPitch, int& minMod, int& maxMod)
+{
+    const short NUM_UNPACKED = 5;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack12BitDataFrom4Bit(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    centerPitch = unpackedData[0];
+    minPitch    = unpackedData[1];
+    maxPitch    = unpackedData[2];
+    minMod      = unpackedData[3];
+    maxMod      = unpackedData[4];
+
+    return status;
+}
+
+// For CMD 40h response: retrieve aftertouch trigger delay of a certain board
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetAftertouchTriggerDelayResponse(const MidiMessage& response, int& boardId, int& triggerDelay)
+{
+    const short NUM_UNPACKED = 1;
+    int unpackedData[NUM_UNPACKED];
+    auto status = unpack8BitData(response, NUM_UNPACKED, unpackedData);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    triggerDelay = unpackedData[0];
+    return status;
+}
+
+// For CMD 42h response: retrieve 12-bit Lumatouch note off delay of a certain board
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetLumatouchNoteOffDelayResponse(const MidiMessage& response, int& boardId, int& delay)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 3);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &response.getSysExData()[PAYLOAD_INIT];
+
+    delay = (payload[0] << 8) | (payload[1] << 4) | payload[2];
+
+    return status;
+}
+
+// For CMD 44h response: retrieve 12-bit expression pedal adc threshold, a 12-bit value
+FirmwareSupport::Error TerpstraMidiDriver::unpackGetExpressionPedalThresholdResponse(const MidiMessage& response, int& thresholdValue)
+{
+    auto status = messageIsValidLumatoneResponse(response);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    status = responseIsExpectedLength(response, 3);
+    if (status != FirmwareSupport::Error::noError)
+        return status;
+
+    auto payload = &response.getSysExData()[PAYLOAD_INIT];
+
+    thresholdValue = (payload[0] << 8) | (payload[1] << 4) | payload[2];
+
+    return status;
 }
 
 void TerpstraMidiDriver::sendMessageWithAcknowledge(const MidiMessage& message)
 {
+    if (sendTestMessagesOnly && message.isSysEx())
+    {
+        auto sysExData = message.getSysExData();
+        if (   sysExData[CMD_ID] != GET_SERIAL_IDENTITY
+            && sysExData[CMD_ID] != GET_FIRMWARE_REVISION
+            && sysExData[CMD_ID] != LUMA_PING)
+        {
+            return;
+        }
+    }
+
     // If there is no MIDI input port active: just send, without expecting acknowledge
 	// ToDo Or do nothing?
     if (midiInput == nullptr)
@@ -510,7 +1279,7 @@ void TerpstraMidiDriver::sendMessageWithAcknowledge(const MidiMessage& message)
 		}
 
         // If there is no message waiting for acknowledge: send oldest message of queue
-       	if (!isTimerRunning())
+       	if (!isTimerRunning() && !hasMsgWaitingForAck)
         {
             sendOldestMessageInQueue();
         }
@@ -541,10 +1310,20 @@ void TerpstraMidiDriver::sendCurrentMessage()
     jassert(!isTimerRunning());
     jassert(hasMsgWaitingForAck);
 
+#if JUCE_DEBUG
+    if (currentMsgWaitingForAck.isSysEx())
+    {
+        auto sysExData = currentMsgWaitingForAck.getSysExData();
+        for (int i = 0; i < currentMsgWaitingForAck.getSysExDataSize(); i++)
+            jassert(sysExData[i] <= 0x7f);
+    }
+#endif
+
     sendMessageNow(currentMsgWaitingForAck);        // send it
 
     // Notify listeners
 	{
+        DBG("SENT    : " + currentMsgWaitingForAck.getDescription());
 		const MessageManagerLock mmLock;
 		this->listeners.call(&Listener::midiMessageSent, currentMsgWaitingForAck);
 	}
@@ -558,7 +1337,12 @@ void TerpstraMidiDriver::handleIncomingMidiMessage(MidiInput* source, const Midi
     // Notify listeners
 	{
 		const MessageManagerLock mmLock;
-		this->listeners.call(&Listener::midiMessageReceived, message);
+        
+        // DEBUG
+        if (message.isSysEx())
+            DBG("RECEIVED: " + message.getDescription());
+        
+		this->listeners.call(&Listener::midiMessageReceived, source, message);
 	}
 
     // Check whether received message is an answer to the previously sent one
@@ -572,6 +1356,12 @@ void TerpstraMidiDriver::handleIncomingMidiMessage(MidiInput* source, const Midi
         // Check answer state (error yes/no)
         auto answerState = message.getSysExData()[5];
         // if answer state is "busy": resend message after a little delay
+        if (answerState == TerpstraMIDIAnswerReturnCode::STATE)
+        {
+            // turn demo mode off
+            startDemoMode(false);
+        }
+
         if ( answerState == TerpstraMIDIAnswerReturnCode::BUSY)
         {
             // Start delay timer, after which message will be sent again
@@ -586,17 +1376,6 @@ void TerpstraMidiDriver::handleIncomingMidiMessage(MidiInput* source, const Midi
 
             // If there are more messages waiting in the queue: send the next one
             sendOldestMessageInQueue();
-
-            if (messageIsGetFirmwareRevisionResponse(message))
-            {
-                firmwareVersion = FirmwareVersion::fromGetFirmwareRevisionMsg(message);
-#if JUCE_DEBUG
-                {
-                    const MessageManagerLock mml;
-                    DBG("Firmware version is: " + firmwareVersion.toString());
-                }
-#endif
-            }
         }
     }
 
@@ -609,14 +1388,17 @@ void TerpstraMidiDriver::timerCallback()
 
     if (timerType == waitForAnswer)
     {
+        // For now: Remove from buffer, try to send next one
+        hasMsgWaitingForAck = false;
+
         // No answer came from MIDI input
 		{
+            DBG("DRIVER: NO ANSWER");
 			const MessageManagerLock mmLock;
-			this->listeners.call(&Listener::generalLogMessage, "No answer from device", HajuErrorVisualizer::ErrorLevel::error);
+			listeners.call(&Listener::generalLogMessage, "No answer from device", HajuErrorVisualizer::ErrorLevel::error);
+            listeners.call(&Listener::noAnswerToMessage, currentMsgWaitingForAck);
 		}
 
-        // For now: Remove from buffer, try to send next one
-        hasMsgWaitingForAck = false;
         sendOldestMessageInQueue();
     }
     else if (timerType == delayWhileDeviceBusy)
@@ -628,43 +1410,9 @@ void TerpstraMidiDriver::timerCallback()
         jassertfalse;
 }
 
-
-TerpstraMidiDriver::FirmwareVersion TerpstraMidiDriver::FirmwareVersion::fromString(String firmwareVersion)
-{
-    FirmwareVersion version(0, 0, 0);
-
-    String afterFirstDecimal = firmwareVersion.fromFirstOccurrenceOf(".", false, true);
-
-    // Just check if it contains at least two decimals
-    if (firmwareVersion.contains(".") && afterFirstDecimal.contains("."))
-    {
-        String majorNum = firmwareVersion.upToFirstOccurrenceOf(".", false, true);
-
-        String minorNum = afterFirstDecimal.upToFirstOccurrenceOf(".", false, true);
-
-        if (minorNum == afterFirstDecimal)
-        {
-            // This means there was only one decimal, don't try to parse
-            return version;
-        }
-
-        String revisionNum = firmwareVersion.fromLastOccurrenceOf(".", false, true);
-        if (revisionNum != revisionNum.upToFirstOccurrenceOf(".", false, true))
-        {
-            // This means there's an additional decimal, don't try to parse
-            return version;
-        }
-
-        version.major = majorNum.getIntValue();
-        version.minor = majorNum.getIntValue();
-        version.revision = majorNum.getIntValue();
-    }
-
-    return version;
+void TerpstraMidiDriver::clearMIDIMessageBuffer()
+{ 
+    messageBuffer.clear();
+    hasMsgWaitingForAck = false;
+    this->listeners.call(&Listener::midiSendQueueSize, 0); 
 }
-
-TerpstraMidiDriver::FirmwareVersion TerpstraMidiDriver::FirmwareVersion::fromGetFirmwareRevisionMsg(const MidiMessage& msgIn)
-{
-    auto data = msgIn.getSysExData();
-    return TerpstraMidiDriver::FirmwareVersion(data[6], data[7], data[8]);
-}
\ No newline at end of file
diff --git a/Source/TerpstraMidiDriver.h b/Source/TerpstraMidiDriver.h
index f3ab8024..f7a79725 100644
--- a/Source/TerpstraMidiDriver.h
+++ b/Source/TerpstraMidiDriver.h
@@ -12,74 +12,11 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include "JuceHeader.h"
-#include "KeyboardDataStructure.h"
 #include "HajuLib/HajuMidiDriver.h"
 #include "HajuLib/HajuErrorVisualizer.h"
+#include "LumatoneFirmwareDefinitions.h"
 //[/Headers]
 
-/*
-==============================================================================
-System exclusive command bytes
-==============================================================================
-*/
-
-#define CHANGE_KEY_NOTE 0x00
-#define SET_KEY_COLOUR 0x01
-
-#define SET_FOOT_CONTROLLER_SENSITIVITY 0x03
-#define INVERT_FOOT_CONTROLLER 0x04
-
-#define MACROBUTTON_COLOUR_ON 0x05
-#define MACROBUTTON_COLOUR_OFF 0x06
-
-#define SET_LIGHT_ON_KEYSTROKES 0x07
-
-#define SET_VELOCITY_CONFIG 0x08
-#define SAVE_VELOCITY_CONFIG 0x09
-#define RESET_VELOCITY_CONFIG 0x0A
-
-#define SET_FADER_CONFIG 0x0B
-#define SAVE_FADER_CONFIG 0x0C
-#define RESET_FADER_CONFIG 0x0D
-
-#define SET_AFTERTOUCH_FLAG 0x0E
-#define CALIBRATE_AFTERTOUCH 0x0F
-#define SET_AFTERTOUCH_CONFIG 0x10
-#define SAVE_AFTERTOUCH_CONFIG 0x11
-#define RESET_AFTERTOUCH_CONFIG 0x12
-
-#define GET_RED_LED_CONFIG 0x13
-#define GET_GREEN_LED_CONFIG 0x14
-#define GET_BLUE_LED_CONFIG 0x15
-#define GET_CHANNEL_CONFIG 0x16
-#define GET_NOTE_CONFIG 0x17
-#define GET_KEYTYPE_CONFIG 0x18
-
-#define GET_MAX_THRESHOLD 0x19
-#define GET_MIN_THRESHOLD 0x1A
-#define GET_AFTERTOUCH_MAX 0x1B
-#define GET_KEY_VALIDITY 0x1C
-
-#define GET_VELOCITY_CONFIG 0x1D
-#define GET_FADER_CONFIG 0x1E
-#define GET_AFTERTOUCH_CONFIG 0x1F
-
-#define SET_VELOCITY_INTERVALS 0x20
-#define GET_VELOCITY_INTERVALS 0x21
-
-#define GET_SERIAL_IDENTITY 0x23
-
-#define CALIBRATE_KEYS 0x24
-
-#define CALIBRATE_PITCH_MOD_WHEEL 0x26
-
-#define SET_LUMATOUCH_CONFIG 0x2d
-#define SAVE_LUMATOUCH_CONFIG 0x2e
-#define RESET_LUMATOUCH_CONFIG 0x2f
-#define GET_LUMATOUCH_CONFIG 0x30
-
-#define GET_FIRMWARE_REVISION 0x31
-
 /*
 ==============================================================================
 Connection to midi, sending SysEx parameters to keyboard
@@ -96,45 +33,11 @@ class TerpstraMidiDriver : public HajuMidiDriver, public MidiInputCallback, publ
 		// Destructor
 		virtual ~Listener() {}
 
-		virtual void midiMessageReceived(const MidiMessage& midiMessage) = 0;
+		virtual void midiMessageReceived(MidiInput* source, const MidiMessage& midiMessage) = 0;
 		virtual void midiMessageSent(const MidiMessage& midiMessage) = 0;
 		virtual void midiSendQueueSize(int queueSize) = 0;
         virtual void generalLogMessage(String textMessage, HajuErrorVisualizer::ErrorLevel errorLevel) = 0;
-	};
-
-	typedef enum
-	{
-	    NACK = 0x00,    // Not recognized
-	    ACK = 0x01,     // Acknowledged, OK
-	    BUSY = 0x02,    // Controller busy
-	    ERROR = 0x03,   // Error
-	} TerpstraMIDIAnswerReturnCode;
-
-	enum sysExSendingMode
-	{
-		liveEditor = 0,
-		offlineEditor = 1
-	};
-
-	//==============================================================================
-	// Helper class for parsing and comparing (todo) firmware versions
-
-	struct FirmwareVersion
-	{
-		int major = 0;
-		int minor = 0;
-		int revision = 0;
-
-		FirmwareVersion(int majorVersion, int minorVersion, int revisionNumber)
-			: major(majorVersion), minor(minorVersion), revision(revisionNumber) {}
-
-		bool isValid() { return major > 0 || minor > 0 || revision > 0; }
-
-		String toString() const { return String(major) + "." + String(minor) + "." + String(revision); }
-
-		static FirmwareVersion fromString(String firmwareVersion);
-
-		static FirmwareVersion fromGetFirmwareRevisionMsg(const MidiMessage& msgIn);
+		virtual void noAnswerToMessage(const MidiMessage& midiMessage) = 0;
 	};
 
 private:
@@ -148,99 +51,247 @@ class TerpstraMidiDriver : public HajuMidiDriver, public MidiInputCallback, publ
 	TerpstraMidiDriver();
 	~TerpstraMidiDriver();
 
-	void setAutoSave(bool value) { this->autoSave = value; }
-	void setManufacturerId(int value) { manufacturerId = value; }
-
 	void addListener(Listener* listenerToAdd);
 	void removeListener(Listener* listenerToRemove);
 
-	sysExSendingMode getSysExSendingMode() const { return currentSysExSendingMode; }
-	void setSysExSendingMode(sysExSendingMode newMode);
+	void restrictToTestMessages(bool testMessagesOnly) { sendTestMessagesOnly = testMessagesOnly; }
 
-	FirmwareVersion getFirmwareVersion() const { return firmwareVersion; }
+	//============================================================================
+	// Single (mid-level) commands, firmware specific
 
-	//////////////////////////////////
-	// Combined (hi-level) commands
+	// CMD 00h: Send a single key's functionctional configuration
+	void sendKeyFunctionParameters(uint8 boardIndex, uint8 keyIndex, uint8 noteOrCCNum, uint8 midiChannel, uint8 keyType, bool faderUpIsNull = true);
 
-	// Send all parametrizations of one sub board
-	void sendAllParamsOfBoard(int boardIndex, TerpstraKeys boardData);
+	// CMD 01h: Send a single key's LED channel intensities, three 8-bit values
+	void sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue);
+	// CMD 01h: Send a single key's LED channel intensities, three pairs of 4-bit values for each channel
+	void sendKeyLightParameters(uint8 boardIndex, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower);
+	// CMD 01h: Send a single key's LED channel intensities, three 7-bit values
+	void sendKeyLightParameters_Version_1_0_0(uint8 boardIndex, uint8 keyIndex, uint8 red, uint8 green, uint8 blue);
 
-	// Send and save a complete key mapping
-	void sendCompleteMapping(TerpstraKeyMapping mappingData);
+	// CMD 02h: Save current configuration to specified preset index
+	void saveProgram(uint8 presetNumber);
 
-    // Send request to receive the current mapping of one sub board on the controller
-	void sendGetMappingOfBoardRequest(int boardIndex);
+	// CMD 03h: Send expression pedal sensivity
+	void sendExpressionPedalSensivity(uint8 value);
 
-	// Send request to receive the complete current mapping on the controller
-	void sendGetCompleteMappingRequest();
+	// CMD 04h: Send parametrization of foot controller
+	void sendInvertFootController(bool value);
 
-	//////////////////////////////////
-	// Single (mid-level) commands
+	// CMD 05h: Colour for macro button in active state, 3 8-bit values
+	void sendMacroButtonActiveColour(uint8 red, uint8 green, uint8 blue);
+	// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+	void sendMacroButtonActiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower);
+	// CMD 05h: Colour for macro button in active state, 3 7-bit values
+	void sendMacroButtonActiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue);
+
+	// CMD 06h: Colour for macro button in inactive state
+	void sendMacroButtonInactiveColour(int red, int green, int blue);
+	// CMD 05h: Colour for macro button in active state, 3 pairs for 4-bit values for each LED channel
+	void sendMacroButtonInactiveColour(uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower);
+	// CMD 05h: Colour for macro button in active state, 3 7-bit values
+	void sendMacroButtonInactiveColour_Version_1_0_0(uint8 red, uint8 green, uint8 blue);
+
+	// CMD 07h: Send parametrization of light on keystrokes
+	void sendLightOnKeyStrokes(bool value);
 
-	// Send parametrization of one key to the device
-	void sendKeyParam(int boardIndex, int keyIndex, TerpstraKey keyData);
+	// CMD 08h: Send a value for a velocity lookup table (128 7-bit values)
+	void sendVelocityConfig(const uint8 velocityTable[]);
 
-	// Send expression pedal sensivity
-	void sendExpressionPedalSensivity(unsigned char value);
+	// CMD 09h: Save velocity config to EEPROM
+	void saveVelocityConfig();
 
-	// Send parametrization of foot controller
-	void sendInvertFootController(bool value);
+	// CMD 0Ah: Reset velocity config to value from EEPROM
+	void resetVelocityConfig();
 
-	// Colour for macro button in active state
-	void sendMacroButtonActiveColour(String colourAsString);
+	// CMD 0Bh: Adjust the internal fader look-up table (size of 128)
+	void sendFaderConfig(const uint8 faderTable[]);
 
-	// Colour for macro button in inactive state
-	void sendMacroButtonInactiveColour(String colourAsString);
+	// CMD 0Ch: **DEPRECATED** Save the changes made to the fader look-up table
+	void saveFaderConfiguration();
 
-	// Send parametrization of light on keystrokes
-	void sendLightOnKeyStrokes(bool value);
+	// CMD 0Dh: Reset the fader lookup table back to its factory fader settings.
+	void resetFaderConfig();
 
-	// Send a value for a velocity lookup table
-	void sendVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType, unsigned char velocityTable[]);
+	// CMD 0Eh: Enable or disable aftertouch functionality
+	void sendAfterTouchActivation(bool value);
 
-	// Save velocity config to EEPROM
-	void saveVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType);
+	// CMD 0Fh: Initiate aftertouch calibration routine
+	void sendCalibrateAfterTouch();
 
-	// reset velocity config to value from EEPROM
-	void resetVelocityConfig(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType);
+	// CMD 10h: Adjust the internal aftertouch look-up table (size of 128)
+	void sendAftertouchConfig(const uint8 aftertouchTable[]);
 
-	void sendAfterTouchActivation(bool value);
+	// CMD 11h: **DEPRECATED** Save the changes made to the aftertouch look-up table
+	void saveAftertouchConfig();
 
-	void sendCalibrateAfterTouch();
+	// CMD 12h: Reset the aftertouch lookup table back to its factory aftertouch settings.
+	void resetAftertouchConfig();
+
+	// CMD 13h: Read back the current red intensity of all the keys of the target board.
+	void sendRedLEDConfigRequest(uint8 boardIndex);
+
+	// CMD 14h: Read back the current green intensity of all the keys of the target board.
+	void sendGreenLEDConfigRequest(uint8 boardIndex);
+
+	// CMD 15h: Read back the current blue intensity of all the keys of the target board.
+	void sendBlueLEDConfigRequest(uint8 boardIndex);
+
+	// CMD 16h: Read back the current channel configuration of all the keys of the target board.
+	void sendChannelConfigRequest(uint8 boardIndex);
+
+	// CMD 17h: Read back the current note configuration of all the keys of the target board.
+	void sendNoteConfigRequest(uint8 boardIndex);
+
+	// CMD 18h: Read back the current key type configuration of all the keys of the target board.
+	void sendKeyTypeConfigRequest(uint8 boardIndex);
+
+	// CMD 19h: Read back the maximum fader (note on) threshold of all the keys of the target board.
+	void sendMaxFaderThresholdRequest(uint8 boardIndex);
+
+	// CMD 1Ah: Read back the maximum fader (note on) threshold of all the keys of the target board
+	void sendMinFaderThresholdRequest(uint8 boardIndex);
+
+	// CMD 1Bh: Read back the aftertouch maximum threshold of all the keys of the target board
+	void sendMaxAftertouchThresholdRequest(uint8 boardIndex);
+
+	// CMD 1Ch: Get back flag whether or not each key of target board meets minimum threshold
+	void sendKeyValidityParametersRequest(uint8 boardIndex);
+	
+	// CMD 1Dh: Read back the current velocity look up table of the keyboard.
+	void sendVelocityConfigRequest();
+
+	// CMD 1Eh: Read back the current fader look up table of the keyboard.
+	void sendFaderConfigRequest();
+
+	// CMD 1Fh: Read back the current aftertouch look up table of the keyboard.
+	void sendAftertouchConfigRequest();
+
+	// CMD 20h: Set the velocity interval table, 127 12-bit values (up to 0x7fff
+    void sendVelocityIntervalConfig(const int velocityIntervalTable[]);
+
+	// CMD 21h: Sead back the velocity interval table
+	void sendVelocityIntervalConfigRequest();
+
+	// CMD 22h: Read back the fader type of all keys on the targeted board.
+	void sendFaderTypeConfigRequest(uint8 boardIndex);
 
+	// CMD 23h: This command is used to read back the serial identification number of the keyboard.
+	void sendGetSerialIdentityRequest(int sendToTestDevice = -1);
+
+	// CMD 24h: Initiate the key calibration routine; each pair of macro buttons  
+	// on each octave must be pressed to return to normal state
 	void sendCalibrateKeys();
 
+	// CMD 25h: Pass in true to enter Demo Mode, or false to exit
+	void startDemoMode(bool turnOn);
+
+	// CMD 26h: Initiate the pitch and mod wheel calibration routine, pass in false to stop
 	void sendCalibratePitchModWheel(bool startCalibration);
 
-    void sendVelocityIntervalConfig(int velocityIntervalTable[]);
+	// CMD 27h: Set the sensitivity value of the mod wheel, 0x01 to 0x07f
+	void setModWheelSensitivity(uint8 sensitivity);
 
-	void sendRedLEDConfigurationRequest(int boardIndex);
+	// CMD 28h: Set the sensitivity value of the pitch bend wheel between 0x01 and 0x3FFF
+	void setPitchBendSensitivity(int sensitivity);
 
-	void sendGreenLEDConfigurationRequest(int boardIndex);
+	// CMD 29h: Set abs. distance from max value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+	void setKeyMaximumThreshold(uint8 boardIndex, uint8 maxThreshold, uint8 aftertouchMax);
 
-	void sendBlueLEDConfigurationRequest(int boardIndex);
+	// CMD 2Ah: Set abs. distance from min value to trigger CA-004 submodule key events, ranging from 0x00 to 0xFE
+	void setKeyMinimumThreshold(uint8 boardIndex, uint8 minThresholdHigh, uint8 minThresholdLow);
 
-	void sendChannelConfigurationRequest(int boardIndex);
+	// CMD 2Bh: Set the sensitivity for CC events, ranging from 0x00 to 0xFE
+	void setFaderKeySensitivity(uint8 boardIndex, uint8 sensitivity);
 
-	void sendNoteConfigurationRequest(int boardIndex);
+	// CMD 2Ch: Set the target board sensitivity for aftertouch events, ranging from 0x00 to 0xFE
+	void setAftertouchKeySensitivity(uint8 boardIndex, uint8 sensitivity);
 
-	void sendKeyTypeConfigurationRequest(int boardIndex);
+	// CMD 2Dh: Adjust the Lumatouch table, 127 7-bit values, where 127 is a result of a fully pressed key
+	void setLumatouchConfig(const uint8 lumatouchTable[]);
 
-	void sendVelocityConfigurationRequest(TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType);
+	// CMD 2Eh: **DEPRECATED** Save Lumatouch table changes
+	void saveLumatoneConfig();
 
-	void sendVelocityIntervalConfigRequest();
+	// CMD 2Fh: Reset the Lumatouch table back to factory settings
+	void resetLumatouchConfig();
 
-	// This command is used to read back the serial identification number of the keyboard.
-	void sendGetSerialIdentityRequest(bool overrideEditMode = false);
-	MidiMessage getSerialIdentityRequestMessage() const;
+	// CMD 30h: Read back the Lumatouch table
+	void sendLumatouchConfigRequest();
 
-	// This command is used to read back the current Lumatone firmware revision.
+	// CMD 31h: This command is used to read back the current Lumatone firmware revision.
 	// The firmware version format is in the form {Major}.{Minor}.{Revision}
-	// If the board has not been initialized, the Beaglebone will contain a firmware revision of 0.0.0 for the board.
-	void sendGetFirmwareRevisionRequest(bool overrideEditMode = false);
-	MidiMessage getFirmwareRevisionRequestMessage() const;
+	// If the board has not been initialized, the Beaglebone will contain a firmware revision of 0.0.0 for the board
+	void sendGetFirmwareRevisionRequest(int sendToTestDevice = -1);
+
+	// CMD 32h: Set the thresold from key’s min value to trigger CA - 004 submodule CC events, ranging from 0x00 to 0xFE
+	void setCCActiveThreshold(uint8 boardIndex, uint8 sensitivity);
+
+	// CMD 33h: Echo the payload, 3 7-bit values, for use in connection monitoring
+    // the first 7-bit value is reserved for echo differentiation
+	void ping(uint8 value1, uint8 value2, uint8 value3, int sendToTestDevice = -1);
+	unsigned int ping(unsigned int value, int sendToTestDevice = -1);
+
+	// CMD 34h: Reset the thresholds for events and sensitivity for CC & aftertouch on the target board
+	void resetBoardThresholds(uint8 boardIndex);
+
+	// CMD 35h: Enable/disable key sampling over SSH for the target key and board
+	void setKeySampling(uint8 boardIndex, uint8 keyIndex, bool turnSamplingOn);
+
+	// CMD 36h: Set thresholds for the pitch and modulation wheel to factory settings
+	void resetWheelsThresholds();
+
+	// CMD 37h: Set the bounds from the calibrated zero adc value of the pitch wheel, 0x00 to 0x7f
+	void setPitchWheelZeroThreshold(uint8 threshold);
+
+	// CMD 38h: Pass in true to initiate the expression pedal calibration routine, or false to stop
+	void calibrateExpressionPedal(bool startCalibration);
+
+	// CMD 39h: Reset expression pedal minimum and maximum bounds to factory settings
+	void resetExpressionPedalBounds();
+
+	// CMD 3Ah: Retrieve the threshold values of target board
+	void getBoardThresholdValues(uint8 boardIndex);
+
+	// CMD 3Bh: Retrieve the sensitivity values of target board
+	void getBoardSensitivityValues(uint8 boardIndex);
+
+	// CMD 3Ch: Set the MIDI channels for peripheral controllers
+	void setPeripheralChannels(uint8 pitchWheelChannel, uint8 modWheelChannel, uint8 expressionChannel, uint8 sustainChannel);
+
+	// CMD 3Dh: Retrieve the MIDI channels for peripheral controllers
+	void getPeripheralChannels();
 
-	////////////////////////////////////////////////////////////////////////////
+	// CMD 3Eh: This command is only used for automatic responses containing calibration data every 100ms while in calibration mode
+	// Sending a SysEx message containing this command will result in a NACK response
+
+	// CMD 3Fh: Set the 8-bit aftertouch trigger delay value, the time between a note on event and the initialization of aftertouch events
+	void setAfterTouchTriggerDelay(uint8 boardIndex, uint8 aftertouchTriggerValue);
+	void setAfterTouchTriggerDelay(uint8 boardIndex, uint8 triggerValueUpperNibble, uint8 triggerValueLowerNibble);
+
+	// CMD 40h: Retrieve the aftertouch trigger delay of the given board
+	void sendGetAftertouchTriggerDelayRequest(uint8 boardIndex);
+
+	// CMD 41h: Set the Lumatouch note-off delay value, an 11-bit integer representing the amount of 1.1ms ticks before
+	// sending a note-off event after a Lumatone-configured key is released. 
+	void setLumatouchNoteOffDelay(uint8 boardIndex, int delayValue);
+	void setLumatouchNoteOffDelay(uint8 boardIndex, uint8 valueBits8_11, uint8 valueBits4_7, uint8 valueBits0_3);
+
+	// CMD 42h: Retrieve the note-off delay value of the given board
+	void sendGetLumatouchNoteOffDelayRequest(uint8 boardIndex);
+
+	// CMD 43h: Set expression pedal ADC threshold value, a 12-bit integer
+	void setExpressionPedalADCThreshold(int thresholdValue);
+	// CMD 43h: Set expression pedal ADC threshold value with 3 4-bit integers representing a 12-bit integer
+	void setExpressionPedalADCThreshold(uint8 valueBits8_12, uint8 valueBits4_7, uint8 valueBits0_3);
+
+	// CMD 44h: Get the current expression pedal ADC threshold value
+	void sendGetExpressionPedalADCThresholdRequest();
+
+	// CMD 45h: Configure the on/off settings of the sustain pedal
+	void sendInvertSustainPedal(bool setInverted);
+
+	//============================================================================
 	// Implementation of bidirectional communication with acknowledge messages
 
 	// MIDI input callback: handle acknowledge messages
@@ -250,26 +301,99 @@ class TerpstraMidiDriver : public HajuMidiDriver, public MidiInputCallback, publ
 	void timerCallback() override;
 
 	// Clear MIDI message buffer
-	void clearMIDIMessageBuffer() { messageBuffer.clear(); this->listeners.call(&Listener::midiSendQueueSize, 0);  }
+	void clearMIDIMessageBuffer();
 
 	// Message is an answer to a sent message yes/no
 	static bool messageIsResponseToMessage(const MidiMessage& answer, const MidiMessage& originalMessage);
 
-	// Message is SysEx message with Terpstra manufacturer ID yes/no
-    bool messageIsTerpstraSysExMessage(const MidiMessage& midiMessage);
+	// Message is SysEx message with Lumatone Inc. manufacturer ID, valid board ID byte, and acknowledged status
+	FirmwareSupport::Error messageIsValidLumatoneResponse(const MidiMessage& midiMessage);
+
+	// Determines if response is too short, too long, or expected
+	FirmwareSupport::Error responseIsExpectedLength(const MidiMessage& midiMessage, size_t numPayloadBytes);
+
+	//============================================================================
+	// Specific commands for unpacking responses, returns error code
+
+	// For CMD 13h response: unpacks 8-bit key data for red LED intensity. 112 bytes, lower and upper nibbles for 56 values
+	FirmwareSupport::Error unpackGetLEDConfigResponse(const MidiMessage& response, int& boardId, int* keyData);
+	
+	// For CMD 13h response: unpacks 7-bit key data for red LED intensity. 56 bytes, each value must be multiplied by 5
+	FirmwareSupport::Error unpackGetLEDConfigResponse_Version_1_0_0(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
+
+	// For CMD 16h response: unpacks 7-bit channel data for note configuration. 55 or 56 bytes
+	FirmwareSupport::Error unpackGetChannelConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
+
+	// For CMD 17h response: unpacks 7-bit key data for note configuration. 55 or 56 bytes
+	FirmwareSupport::Error unpackGetNoteConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
+
+	// For CMD 18h response: unpacks 7-bit key type data for key configuration. 55 or 56 bytes
+	FirmwareSupport::Error unpackGetTypeConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
+
+	// For CMD 19h response: unpacks 8-bit key data for maximums of adc threshold. 55 or 56 bytes
+	FirmwareSupport::Error unpackGetKeyMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
 
-	// Message contains configuration data sent from controller yes/no
-    bool messageIsTerpstraConfigurationDataReceptionMessage(const MidiMessage& midiMessage);
+	// For CMD 1Ah response: unpacks 8-bit key data for minimums of adc threshold. 55 or 56 bytes
+	FirmwareSupport::Error unpackGetKeyMinThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
 
-    // Message contains velocity curve data from controller for the specified velocity curve type yes/no
-    bool messageIsTerpstraVelocityConfigReceptionMessage(const MidiMessage& midiMessage, TerpstraVelocityCurveConfig::VelocityCurveType velocityCurveType);
+	// For CMD 1Bh response: unpacks 8-bit key data for maximums of adc threshold for aftertouch triggering. 55 or 56 bytes
+	FirmwareSupport::Error unpackGetAftertouchMaxThresholdsResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* keyData);
 
-    bool messageIsVelocityIntervalConfigReceptionMessage(const MidiMessage& midiMessage);
+	// For CMD 1Ch response: unpacks boolean key validity data for board, whether or not each key meets threshold specs
+	FirmwareSupport::Error unpackGetKeyValidityResponse(const MidiMessage& response, int& boardId, uint8 numKeys, bool* keyValidityData);
 
-	// Message contains the serial identification number of the controller
-	bool messageIsGetSerialIdentityResponse(const MidiMessage& midiMessage);
+	// For CMD 1Dh response: unpacks 7-bit velocity configuration of keyboard, 128 bytes
+	FirmwareSupport::Error unpackGetVelocityConfigResponse(const MidiMessage& response, int* velocityData);
+
+	// For CMD 1Eh response: unpacks 7-bit fader configuration of keyboard, 128 bytes
+	FirmwareSupport::Error unpackGetFaderConfigResponse(const MidiMessage& response, int* faderData);
+
+	// For CMD 1Fh response: unpacks 7-bit aftertouch configuration of keyboard, 128 bytes
+	FirmwareSupport::Error unpackGetAftertouchConfigResponse(const MidiMessage& response, int* aftertouchData);
+
+	// For CMD 21h response: unpacks 12-bit velocity interval configuration of keyboard, 254 bytes encoding 127 values
+	FirmwareSupport::Error unpackGetVelocityIntervalConfigResponse(const MidiMessage& response, int* intervalData);
+
+	// For CMD 22h response: unpacks 7-bit fader type configuration of board, 56 bytes
+	FirmwareSupport::Error unpackGetFaderConfigResponse(const MidiMessage& response, int& boardId, uint8 numKeys, int* faderData);
+
+	// For CMD 23h response: unpacks serial ID number of keyboard, 12 7-bit values encoding 6 bytes
+	FirmwareSupport::Error unpackGetSerialIdentityResponse(const MidiMessage& response, int* serialBytes);
+
+	// For CMD 30h response: unpacks 7-bit Lumatouch configuration of keyboard, 128 bytes
+	FirmwareSupport::Error unpackGetLumatouchConfigResponse(const MidiMessage& response, int* lumatouchData);
+
+	// For CMD 31h response: unpacks firmware revision running on the keyboard
+	FirmwareSupport::Error unpackGetFirmwareRevisionResponse(const MidiMessage& response, int& majorVersion, int& minorVersion, int& revision);
+
+	// For CMD 33h response: echo payload
+	FirmwareSupport::Error unpackPingResponse(const MidiMessage& response, int& value1, int& value2, int& value3, int& value4);
+	FirmwareSupport::Error unpackPingResponse(const MidiMessage& response, unsigned int& value);
+
+	// For CMD 3Ah response: retrieve all 8-bit threshold values of a certain board
+	FirmwareSupport::Error unpackGetBoardThresholdValuesResponse(const MidiMessage& response, int& boardId, int& minHighThreshold, int& minLowThreshold, int& maxThreshold, int& aftertouchThreshold, int& ccThreshold);
+
+	// For CMD 3Bh response: retrieve all threshold values of a certain board
+	FirmwareSupport::Error unpackGetBoardSensitivityValuesResponse(const MidiMessage& response, int& boardId, int& ccSensitivity, int& aftertouchSensitivity);
+
+	// For CMD 3Dh response: retrieve MIDI channels of which peripherals are configured
+	FirmwareSupport::Error unpackGetPeripheralChannelsResponse(const MidiMessage& response, int& pitchWheelChannel, int& modWheelChannel, int& expressionChannel, int& sustainPedalChannel);
+
+	// For CMD 3Eh response: retrieve 12-bit expression pedal calibration status values in respective mode, automatically sent every 100ms
+	FirmwareSupport::Error unpackExpressionPedalCalibrationPayload(const MidiMessage& response, int& minBound, int& maxBound, bool& valid);
+
+	// For CMD 3Eh response: retrieve 12-bit pitch & mod wheel calibration status values in respective mode, automatically sent every 100ms
+	FirmwareSupport::Error unpackWheelsCalibrationPayload(const MidiMessage& response, int& centerPitch, int& minPitch, int& maxPitch, int& minMod, int& maxMod);
+
+	// For CMD 40h response: retrieve 8-bit aftertouch trigger delay of a certain board
+	FirmwareSupport::Error unpackGetAftertouchTriggerDelayResponse(const MidiMessage& response, int& boardId, int& triggerDelay);
+
+	// For CMD 42h response: retrieve 12-bit Lumatouch note off delay of a certain board
+	FirmwareSupport::Error unpackGetLumatouchNoteOffDelayResponse(const MidiMessage& response, int& boardId, int& delay);
+
+	// For CMD 44h response: retrieve 12-bit expression pedal adc threshold
+	FirmwareSupport::Error unpackGetExpressionPedalThresholdResponse(const MidiMessage& response, int& thresholdValue);
 
-	bool messageIsGetFirmwareRevisionResponse(const MidiMessage& midiMessage);
 
 private:
 	// Low-level SysEx message sending
@@ -281,30 +405,70 @@ class TerpstraMidiDriver : public HajuMidiDriver, public MidiInputCallback, publ
 	// Send the message marked as current and start waiting for answer
     void sendCurrentMessage();
 
+	// Fill a buffer with 3-bytes representing the manufacturer's ID
+	void fillManufacturerId(unsigned char* data) const;
+
 	// Create a SysEx message with standardized length
-	MidiMessage createTerpstraSysEx(int boardIndex, unsigned char cmd, unsigned char data1, unsigned char data2, unsigned char data3, unsigned char data4) const;
+	MidiMessage createTerpstraSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4) const;
+
+	// Create a SysEx message to send 8-bit colour precision to a Lumatone key
+	MidiMessage createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const;
+	MidiMessage createExtendedKeyColourSysEx(uint8 boardIndex, uint8 cmd, uint8 keyIndex, int red, int green, int blue) const;
+
+	// Create a SysEx message to send 8-bit colour precision to macro buttons
+	MidiMessage createExtendedMacroColourSysEx(uint8 cmd, uint8 redUpper, uint8 redLower, uint8 greenUpper, uint8 greenLower, uint8 blueUpper, uint8 blueLower) const;
+	MidiMessage createExtendedMacroColourSysEx(uint8 cmd, int red, int green, int blue) const;
+
+	// Create a SysEx message encoding a table with a defined size
+	MidiMessage sendTableSysEx(uint8 boardIndex, uint8 cmd, uint8 tableSize, const uint8 table[]);
 
     // Send a SysEx message with standardized length
-	void sendSysEx(int boardIndex, unsigned char cmd, unsigned char data1, unsigned char data2, unsigned char data3, unsigned char data4, bool overrideEditMode = false);
+	void sendSysEx(uint8 boardIndex, uint8 cmd, uint8 data1, uint8 data2, uint8 data3, uint8 data4, bool overrideEditMode = false);
+
+	// Send a SysEx message without parameters
+	void sendSysExRequest(uint8 boardIndex, uint8 cmd);
+
+	// Send a SysEx message to toggle a state
+	void sendSysExToggle(uint8 boardIndex, uint8 cmd, bool turnStateOn);
+
+	// Checks if message is a valid Lumatone firmware response and is expected length, then runs supplied unpacking function or returns an error code 
+	FirmwareSupport::Error unpackIfValid(const MidiMessage& response, size_t numBytes, std::function<FirmwareSupport::Error(const uint8*)> unpackFunction);
+
+	// Generic unpacking of octave data from a SysEx message
+	FirmwareSupport::Error unpackOctaveConfig(const MidiMessage& msg, int& boardId, size_t numBytes, int* keyData, std::function<FirmwareSupport::Error(const MidiMessage&, size_t, int*)> nBitUnpackFunction);
+
+	// Generic unpacking of 7-bit data from a SysEx message
+	FirmwareSupport::Error unpack7BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData);
+
+	// Unpacking of octave-based 7-bit key configuration data
+	FirmwareSupport::Error unpack7BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData);
+
+	// Generic unpacking of 8-bit data from a SysEx message
+	FirmwareSupport::Error unpack8BitData(const MidiMessage& msg, size_t numBytes, int* unpackedData);
+
+	// Unpacking of octave-based 8-bit data
+	FirmwareSupport::Error unpack8BitOctaveData(const MidiMessage& msg, int& boardId, uint8 numKeys, int* keyData);
+
+	// Generic unpacking of 12-bit data from a SysEx message, when packed with two 7-bit values
+	FirmwareSupport::Error unpack12BitDataFrom7Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData);
+
+	// Generic unpacking of 12-bit data from a SysEx message, when packed with three 4-bit values
+	FirmwareSupport::Error unpack12BitDataFrom4Bit(const MidiMessage& msg, size_t numBytes, int* unpackedData);
 
 	// Attributes
 protected:
     ListenerList<Listener> listeners;
 
 private:
-	bool autoSave;
-	int manufacturerId = 0x002150;
-	FirmwareVersion firmwareVersion = { 0, 0, 0 };
 
     MidiMessage currentMsgWaitingForAck;    // std::optional would be the object of choice,once that is available...
 	bool hasMsgWaitingForAck = false;       // will be obsolete when std::optional is available
 
 	Array<MidiMessage> messageBuffer;
 
-	// Whether SysEx messages are sent or not
-	sysExSendingMode currentSysExSendingMode = sysExSendingMode::liveEditor;
+	bool      sendTestMessagesOnly = false; // Only send GetSerialIdentity, GetFirmwareRevision, and Ping commands
 
 	const int receiveTimeoutInMilliseconds = 2000;
-	const int busyTimeDelayInMilliseconds = 20;
+	const int busyTimeDelayInMilliseconds = 500;
 	TimerType timerType;
 };
diff --git a/Source/VelocityCurveDlgBase.cpp b/Source/VelocityCurveDlgBase.cpp
index a08caa84..7e6a4421 100644
--- a/Source/VelocityCurveDlgBase.cpp
+++ b/Source/VelocityCurveDlgBase.cpp
@@ -287,6 +287,8 @@ void VelocityCurveDlgBase::loadFromMapping()
 		for (int x = 0; x < 128; x++)
 			velocityBeamTable[x]->setValue(x);
 	}
+
+	repaint();
 }
 
 void VelocityCurveDlgBase::sendVelocityTableToController()
@@ -298,7 +300,7 @@ void VelocityCurveDlgBase::sendVelocityTableToController()
 		velocityValues[x] = velocityBeamTable[x]->getValue();
 	}
 
-	TerpstraSysExApplication::getApp().getMidiDriver().sendVelocityConfig(velocityCurveType, velocityValues);
+	TerpstraSysExApplication::getApp().getLumatoneController().sendTableConfig(velocityCurveType, velocityValues);
 }
 
 void VelocityCurveDlgBase::mouseMove(const MouseEvent &event)
diff --git a/Source/ViewComponents.cpp b/Source/ViewComponents.cpp
index e2b3dc47..a2354cfd 100644
--- a/Source/ViewComponents.cpp
+++ b/Source/ViewComponents.cpp
@@ -18,7 +18,7 @@ TerpstraKeyEdit class
 */
 
 TerpstraKeyEdit::TerpstraKeyEdit()
-	: isSelected(false), keyColour(juce::Colour()), keyType(TerpstraKey::noteOnNoteOff)
+	: isSelected(false), keyColour(juce::Colour()), keyType(LumatoneKeyType::noteOnNoteOff)
 {
 	midiNoteLabel = new Label("midiNoteLabel", "0");
 	addAndMakeVisible(midiNoteLabel);
@@ -57,15 +57,18 @@ void TerpstraKeyEdit::setValue(TerpstraKey newValue)
 	String newTooltip = translate("KeyType") + " ";
 	switch (keyType)
 	{
-	case TerpstraKey::noteOnNoteOff:
+	case LumatoneKeyType::noteOnNoteOff:
 		newTooltip += translate("NoteOnOff");
 		break;
-	case TerpstraKey::continuousController:
+	case LumatoneKeyType::continuousController:
 		newTooltip += translate("ContinuousController");
 		break;
-	case TerpstraKey::lumaTouch:
+	case LumatoneKeyType::lumaTouch:
 		newTooltip += translate("Lumatouch");
 		break;
+	case LumatoneKeyType::disabled:
+		newTooltip += translate("Disabled");
+		break;
 	default:
 		jassertfalse;
 		newTooltip += translate("Unknown");
@@ -107,12 +110,21 @@ void TerpstraKeyEdit::paint(Graphics& g)
 	{
 		textColour = textColour.brighter();
 	}
-
-    midiChannelLabel->setColour(juce::Label::textColourId, textColour);
-    midiNoteLabel->setColour(juce::Label::textColourId, textColour);
-
+	
+	if (currentValue.keyType == LumatoneKeyType::disabled)
+	{
+		midiChannelLabel->setVisible(false);
+		midiNoteLabel->setVisible(false);
+	}
+	else
+	{
+		midiChannelLabel->setVisible(true);
+		midiChannelLabel->setColour(juce::Label::textColourId, textColour);
+		midiNoteLabel->setVisible(true);
+		midiNoteLabel->setColour(juce::Label::textColourId, textColour);
+	}
 	// Look depending on Key type
-	if (currentValue.keyType == TerpstraKey::continuousController)
+	if (currentValue.keyType == LumatoneKeyType::continuousController)
 	{
 		// Key type is continuous controller. Set colour gradient.
         float w = this->getWidth();
@@ -140,6 +152,17 @@ void TerpstraKeyEdit::paint(Graphics& g)
 		g.strokePath(hexOutline, PathStrokeType(lineWidth));
 	}
 
+	if (currentValue.keyType == LumatoneKeyType::disabled)
+	{
+		float w = this->getWidth();
+		float h = this->getHeight();
+		float xProportion = 0.25f;
+		// Draw X on key
+		g.setColour(bgColour.contrasting(0.5f));
+		g.drawLine(w * xProportion, h * xProportion, w * (1-xProportion), h * (1-xProportion), 2);
+		g.drawLine(w * (1 - xProportion), h * xProportion, w * xProportion, h * (1 - xProportion), 2);
+	}
+
 	// Something parametrized or not?
 	if (currentValue.isEmpty())
 	{
diff --git a/Source/ViewComponents.h b/Source/ViewComponents.h
index d75d7b31..898d6163 100644
--- a/Source/ViewComponents.h
+++ b/Source/ViewComponents.h
@@ -51,7 +51,7 @@ class TerpstraKeyEdit : public Component, public SettableTooltipClient
 	Label*  midiChannelLabel;
 
 	juce::Colour			keyColour;
-	TerpstraKey::KEYTYPE	keyType;
+	LumatoneKeyType			keyType;
 	
 	float					keySize;
 
diff --git a/TerpstraSysEx.jucer b/TerpstraSysEx.jucer
index 6fc8ab0e..4aa8dbba 100644
--- a/TerpstraSysEx.jucer
+++ b/TerpstraSysEx.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="oPBJmN" name="LumatoneSetup" projectType="guiapp" version="1.0.0"
+<JUCERPROJECT id="oPBJmN" name="LumatoneSetup" projectType="guiapp" version="1.0.1"
               bundleIdentifier="HansStraub.Lumatone.LumatoneSetup" includeBinaryInAppConfig="1"
               companyName="Hans Straub" headerPath="../../../JUCE/modules"
               jucerFormatVersion="1" userNotes="If you'd like to build with licensed fonts, set the associated preprocessor definition to 1, drag &amp; drop a folder containing the official fonts into the Projucer file list, and save the project. Please remember to discard .jucer changes related to licensed fonts before commiting or pushing to a public repo. The folder .\BinaryData\Assets\Fonts is preferred for the font files as it is included in .gitignore."
@@ -84,6 +84,22 @@
       </GROUP>
     </GROUP>
     <GROUP id="{A73AEEF5-637C-D160-EE91-9A6158A5A60C}" name="Source">
+      <GROUP id="{719050EA-2AD7-FDDF-7DF8-6459AA36D42E}" name="Settings">
+        <FILE id="DQiMtc" name="CalibrationDlg.cpp" compile="1" resource="0"
+              file="Source/Settings/CalibrationDlg.cpp"/>
+        <FILE id="qfDjlv" name="CalibrationDlg.h" compile="0" resource="0"
+              file="Source/Settings/CalibrationDlg.h"/>
+        <FILE id="QlIB8f" name="FirmwareDlg.cpp" compile="1" resource="0" file="Source/Settings/FirmwareDlg.cpp"/>
+        <FILE id="loeebJ" name="FirmwareDlg.h" compile="0" resource="0" file="Source/Settings/FirmwareDlg.h"/>
+        <FILE id="jxF9Op" name="SettingsContainer.cpp" compile="1" resource="0"
+              file="Source/Settings/SettingsContainer.cpp"/>
+        <FILE id="chrN2g" name="SettingsContainer.h" compile="0" resource="0"
+              file="Source/Settings/SettingsContainer.h"/>
+      </GROUP>
+      <FILE id="WG01Cj" name="EditActions.cpp" compile="1" resource="0" file="Source/EditActions.cpp"/>
+      <FILE id="cMcg6t" name="EditActions.h" compile="0" resource="0" file="Source/EditActions.h"/>
+      <FILE id="O80YOu" name="LumatoneMenu.cpp" compile="1" resource="0"
+            file="Source/LumatoneMenu.cpp"/>
       <FILE id="W7Jek7" name="FileBrowserComponent.h" compile="0" resource="0"
             file="Source/FileBrowserComponent.h"/>
       <FILE id="wf7BNc" name="LumatoneEditorFonts.h" compile="0" resource="0"
@@ -92,16 +108,6 @@
             file="Source/DeviceActivityMonitor.cpp"/>
       <FILE id="BD6Z4N" name="DeviceActivityMonitor.h" compile="0" resource="0"
             file="Source/DeviceActivityMonitor.h"/>
-      <FILE id="Lu0NhD" name="FirmwareDlg.cpp" compile="1" resource="0" file="Source/FirmwareDlg.cpp"/>
-      <FILE id="dJal0V" name="FirmwareDlg.h" compile="0" resource="0" file="Source/FirmwareDlg.h"/>
-      <FILE id="HO5Z3P" name="SettingsContainer.cpp" compile="1" resource="0"
-            file="Source/SettingsContainer.cpp"/>
-      <FILE id="xvu0bc" name="SettingsContainer.h" compile="0" resource="0"
-            file="Source/SettingsContainer.h"/>
-      <FILE id="l4C6a1" name="CalibrationDlg.cpp" compile="1" resource="0"
-            file="Source/CalibrationDlg.cpp"/>
-      <FILE id="cNe4Ty" name="CalibrationDlg.h" compile="0" resource="0"
-            file="Source/CalibrationDlg.h"/>
       <FILE id="qWvw0s" name="PedalSensitivityDlg.h" compile="0" resource="0"
             file="Source/PedalSensitivityDlg.h"/>
       <FILE id="HOM5JO" name="PedalSensitivityDlg.cpp" compile="1" resource="0"
@@ -274,11 +280,17 @@
             file="Source/FirmwareTransfer.cpp"/>
       <FILE id="ik71Lw" name="FirmwareTransfer.h" compile="0" resource="0"
             file="Source/FirmwareTransfer.h"/>
+      <FILE id="VBB44g" name="LumatoneController.cpp" compile="1" resource="0"
+            file="Source/LumatoneController.cpp"/>
+      <FILE id="A92lud" name="LumatoneController.h" compile="0" resource="0"
+            file="Source/LumatoneController.h"/>
+      <FILE id="HzJKF6" name="LumatoneFirmwareDefinitions.h" compile="0"
+            resource="0" file="Source/LumatoneFirmwareDefinitions.h"/>
     </GROUP>
   </MAINGROUP>
   <EXPORTFORMATS>
     <LINUX_MAKE targetFolder="Builds/Linux" smallIcon="fwSyLL" bigIcon="yjLw0u"
-                linuxExtraPkgConfig="libssh2" extraDefs="SERVERHOST=&quot;192.168.6.2&quot; HAVE_ARPA_INET_H=1 HAVE_UNISTD_H=1">
+                linuxExtraPkgConfig="libssh2" extraDefs="HAVE_ARPA_INET_H=1 HAVE_UNISTD_H=1 HAVE_POLL_H=1 SERVERHOST1=&quot;192.168.6.2&quot; SERVERHOST2=&quot;192.168.7.2&quot;">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" libraryPath="/usr/X11R6/lib/" isDebug="1" optimisation="1"
                        targetName="LumatoneSetup"/>
@@ -297,8 +309,8 @@
       </MODULEPATHS>
     </LINUX_MAKE>
     <XCODE_MAC targetFolder="Builds/MacOSX" bigIcon="yjLw0u" hardenedRuntime="1"
-               extraDefs="HAVE_SYS_SOCKET_H=1 HAVE_NETINET_IN_H=1 HAVE_SYS_SELECT_H=1 HAVE_UNISTD_H=1 HAVE_ARPA_INET_H=1 HAVE_SYS_TIME_H=1 SERVERHOST=&quot;192.168.6.2&quot;"
-               xcodeValidArchs="arm64,x86_64" extraCompilerFlags="-I../../Libraries/mac/include"
+               extraDefs="HAVE_SYS_SOCKET_H=1 HAVE_NETINET_IN_H=1 HAVE_SYS_SELECT_H=1 HAVE_UNISTD_H=1 HAVE_ARPA_INET_H=1 HAVE_SYS_TIME_H=1 HAVE_POLL_H=1 SERVERHOST1=&quot;192.168.6.2&quot; SERVERHOST2=&quot;192.168.7.2&quot;"
+               xcodeValidArchs="x86_64" extraCompilerFlags="-I../../Libraries/mac/include"
                embeddedFrameworks="../../Libraries/mac/lib/libgpg-error.0.dylib&#10;../../Libraries/mac/lib/libgcrypt.20.dylib&#10;../../Libraries/mac/lib/libssh2.1.dylib"
                smallIcon="fwSyLL">
       <CONFIGURATIONS>