diff --git a/Plugins/IntanRecordingController/RHD2000Editor.cpp b/Plugins/IntanRecordingController/RHD2000Editor.cpp
index 162ca0ed3..0916328f4 100644
--- a/Plugins/IntanRecordingController/RHD2000Editor.cpp
+++ b/Plugins/IntanRecordingController/RHD2000Editor.cpp
@@ -737,6 +737,7 @@ void RHD2000Editor::handleAsyncUpdate()
 	canvas->updateImpedance(impedanceData->streams, impedanceData->channels, impedanceData->magnitudes, impedanceData->phases);
     if (saveImpedances)
     {
+        // this may not work with new Record Node architecture
 		CoreServices::RecordNode::createNewrecordingDir();
 
 		String path(CoreServices::RecordNode::getRecordingPath().getFullPathName()
diff --git a/Source/Processors/MessageCenter/MessageCenter.cpp b/Source/Processors/MessageCenter/MessageCenter.cpp
index 4faf01632..83b2da597 100644
--- a/Source/Processors/MessageCenter/MessageCenter.cpp
+++ b/Source/Processors/MessageCenter/MessageCenter.cpp
@@ -36,6 +36,9 @@ GenericProcessor("Message Center"), newEventAvailable(false), isRecording(false)
                          0, // number of outputs
                          44100.0, // sampleRate
                          128);    // blockSize
+
+    eventChannel = nullptr;
+
 }
 
 MessageCenter::~MessageCenter()
@@ -43,15 +46,26 @@ MessageCenter::~MessageCenter()
 
 }
 
-void MessageCenter::addSpecialProcessorChannels(Array<EventChannel*>& channels) 
+void MessageCenter::addSpecialProcessorChannels() 
 {
-	clearSettings();
-	EventChannel* chan = new EventChannel(EventChannel::TEXT, 1, MAX_MSG_LENGTH, CoreServices::getGlobalSampleRate(), this, 0);
-	chan->setName("GUI Messages");
-	chan->setDescription("Messages from the GUI Message Center");
-	channels.add(chan);
-	eventChannelArray.add(new EventChannel(*chan));
-	updateChannelIndexes();
+
+    if (eventChannel == nullptr)
+    {
+        
+        clearSettings();
+
+        eventChannel = new EventChannel(EventChannel::TEXT, 
+                                            1, 
+                                            MAX_MSG_LENGTH, 
+                                            CoreServices::getGlobalSampleRate(), 
+                                            this, 0);
+
+        eventChannel->setName("GUI Messages");
+        eventChannel->setDescription("Messages from the GUI Message Center");
+        eventChannelArray.add(new EventChannel(*eventChannel));
+
+        updateChannelIndexes();
+    }
 }
 
 AudioProcessorEditor* MessageCenter::createEditor()
@@ -63,6 +77,11 @@ AudioProcessorEditor* MessageCenter::createEditor()
 
 }
 
+const EventChannel* MessageCenter::getMessageChannel()
+{
+    return getEventChannel(0);
+}
+
 void MessageCenter::setParameter(int parameterIndex, float newValue)
 {
     if (isRecording)
@@ -114,8 +133,10 @@ void MessageCenter::process(AudioSampleBuffer& buffer)
 		TextEventPtr event = TextEvent::createTextEvent(getEventChannel(0), CoreServices::getGlobalTimestamp(), eventString);
 		addEvent(getEventChannel(0), event, 0);
 
+        std::cout << "Message Center added event." << std::endl;
+
         newEventAvailable = false;
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/Source/Processors/MessageCenter/MessageCenter.h b/Source/Processors/MessageCenter/MessageCenter.h
index 32ce29d9c..213a1aa85 100644
--- a/Source/Processors/MessageCenter/MessageCenter.h
+++ b/Source/Processors/MessageCenter/MessageCenter.h
@@ -61,6 +61,8 @@ class MessageCenter : public GenericProcessor
     /** A pointer to the Message Center editor. */
     ScopedPointer<MessageCenterEditor> messageCenterEditor;
 
+    const EventChannel* getMessageChannel();
+
     bool enable() override;
     bool disable() override;
 
@@ -75,13 +77,15 @@ class MessageCenter : public GenericProcessor
         needsToSendTimestampMessage = false;
     }
 
-	void addSpecialProcessorChannels(Array<EventChannel*>& channel);
+	void addSpecialProcessorChannels();
 private:
 
     bool newEventAvailable;
     bool isRecording;
     bool needsToSendTimestampMessage;
 
+    ScopedPointer<EventChannel> eventChannel;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MessageCenter);
 
 };
diff --git a/Source/Processors/MessageCenter/MessageCenterEditor.h b/Source/Processors/MessageCenter/MessageCenterEditor.h
index c0093ae52..b66ecafa5 100644
--- a/Source/Processors/MessageCenter/MessageCenterEditor.h
+++ b/Source/Processors/MessageCenter/MessageCenterEditor.h
@@ -64,6 +64,8 @@ class MessageCenterEditor : public AudioProcessorEditor,
 
     String getLabelString();
 
+    MessageCenter* messageCenter;
+
 private:
 
     void buttonClicked(Button* button);
@@ -85,8 +87,6 @@ class MessageCenterEditor : public AudioProcessorEditor,
     /** A JUCE button used to send messages. */
     ScopedPointer<Button> sendMessageButton;
 
-    MessageCenter* messageCenter;
-
     Colour incomingBackground;
     Colour outgoingBackground;
 
diff --git a/Source/Processors/ProcessorGraph/ProcessorGraph.cpp b/Source/Processors/ProcessorGraph/ProcessorGraph.cpp
index 511907e32..0379b53cf 100644
--- a/Source/Processors/ProcessorGraph/ProcessorGraph.cpp
+++ b/Source/Processors/ProcessorGraph/ProcessorGraph.cpp
@@ -346,6 +346,9 @@ void ProcessorGraph::updateConnections(Array<SignalChainTabButton*, CriticalSect
                 //TODO: This is will be removed when probe based audio node added. 
                 connectProcessorToAudioNode(source);
 
+                //if (source->isRecordNode())
+                 //   connectProcessorToMessageCenter(source);
+
                 // find the next dest that's not a merger or splitter
                 GenericProcessor* prev = source;
 
@@ -447,14 +450,16 @@ void ProcessorGraph::updateConnections(Array<SignalChainTabButton*, CriticalSect
             connectProcessors(conn.source, dest, conn.connectContinuous, conn.connectEvents);
         }
     }
+
+    //OwnedArray<EventChannel> extraChannels;
+    getMessageCenter()->addSpecialProcessorChannels();
 	
 	getAudioNode()->updatePlaybackBuffer();
 
-	Array<EventChannel*> extraChannels;
-	getMessageCenter()->addSpecialProcessorChannels(extraChannels);
-
+    /*
     for (auto& recordNode : getRecordNodes())
         recordNode->addSpecialProcessorChannels(extraChannels);
+    */
 
 } // end method
 
@@ -553,6 +558,19 @@ void ProcessorGraph::connectProcessorToAudioNode(GenericProcessor* source)
 
 }
 
+
+void ProcessorGraph::connectProcessorToMessageCenter(GenericProcessor* source)
+{
+
+    // connect event channel
+    addConnection(getMessageCenter()->getNodeId(),    // sourceNodeID
+                  midiChannelIndex,       // sourceNodeChannelIndex
+                  source->getNodeId(),          // destNodeID
+                  midiChannelIndex);      // destNodeChannelIndex
+
+}
+
+
 GenericProcessor* ProcessorGraph::createProcessorFromDescription(Array<var>& description)
 {
 	GenericProcessor* processor = nullptr;
diff --git a/Source/Processors/ProcessorGraph/ProcessorGraph.h b/Source/Processors/ProcessorGraph/ProcessorGraph.h
index 8a9c32496..114a0e2d6 100644
--- a/Source/Processors/ProcessorGraph/ProcessorGraph.h
+++ b/Source/Processors/ProcessorGraph/ProcessorGraph.h
@@ -119,6 +119,7 @@ class ProcessorGraph    : public AudioProcessorGraph
     void connectProcessors(GenericProcessor* source, GenericProcessor* dest,
         bool connectContinuous, bool connectEvents);
     void connectProcessorToAudioNode(GenericProcessor* source);
+    void connectProcessorToMessageCenter(GenericProcessor* source);
 
 	int64 m_startSoftTimestamp{ 0 };
 	const GenericProcessor* m_timestampSource{ nullptr };
diff --git a/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.cpp b/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.cpp
index 1dea39ad7..7cca84bb1 100644
--- a/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.cpp
+++ b/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.cpp
@@ -695,4 +695,4 @@ RecordEngineManager* BinaryRecording::getEngineManager()
 void BinaryRecording::setParameter(EngineParameter& parameter)
 {
 	boolParameter(0, m_saveTTLWords);
-}
\ No newline at end of file
+}
diff --git a/Source/Processors/RecordNode/BinaryFormat/NpyFile.cpp b/Source/Processors/RecordNode/BinaryFormat/NpyFile.cpp
index 26cb8a4cd..77b2fac4d 100644
--- a/Source/Processors/RecordNode/BinaryFormat/NpyFile.cpp
+++ b/Source/Processors/RecordNode/BinaryFormat/NpyFile.cpp
@@ -79,6 +79,19 @@ bool NpyFile::openFile(String path)
     // output stream buffer size defaults to 32768 bytes, but is irrelevant because
     // each updateHeader() call triggers a m_file->flush() to disk:
     m_file = file.createOutputStream();
+
+    if (m_file == nullptr)
+    {
+        LOGD("FAILED to open file @", path);
+    }
+    else
+    {
+        String pad = "";
+        for (int i = 0; i < 162 - path.length(); i++)
+            pad += " ";
+        LOGD("Successfully opened file @", path, pad, m_file);
+    }
+    
     if (!m_file)
         return false;
 
@@ -156,7 +169,8 @@ void NpyFile::writeHeader(const Array<NpyType>& typeList)
 
 void NpyFile::updateHeader()
 {
-    if (m_file != NULL)
+
+    if (true)
     {
         // overwrite the shape part of the header - even without explicitly calling
         // m_file->flush(), overwriting seems to trigger a flush to disk,
diff --git a/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.cpp b/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.cpp
index 6604698d0..f3221c2ba 100644
--- a/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.cpp
+++ b/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.cpp
@@ -69,7 +69,7 @@ String OriginalRecording::getEngineID() const
 
 void OriginalRecording::addSpikeElectrode(int index, const SpikeChannel* elec)
 {
-	spikeFileArray.add(nullptr);
+	//spikeFileArray.add(nullptr); // deprecated
 }
 
 void OriginalRecording::resetChannels()
@@ -91,7 +91,7 @@ void OriginalRecording::openFiles(File rootFolder, int experimentNumber, int rec
 	processorArray.clear();
 	lastProcId = 0;
 
-	//openFile(rootFolder, getEventChannel(0), 0);
+	openFile(rootFolder, getEventChannel(0), 0);
 	openMessageFile(rootFolder);
 
 	int nChannels = getNumRecordedChannels();
@@ -103,10 +103,15 @@ void OriginalRecording::openFiles(File rootFolder, int experimentNumber, int rec
 		blockIndex.add(0);
 		samplesSinceLastTimestamp.add(0);
 	}
-	for (int i = 0; i < spikeFileArray.size(); i++)
+
+	int nSpikes = getNumRecordedSpikes();
+
+	for (int i = 0; i < nSpikes; i++)
 	{
+		spikeFileArray.add(nullptr);
 		openSpikeFile(rootFolder, getSpikeChannel(i), i);
 	}
+
 }
 
 void OriginalRecording::openFile(File rootFolder, const InfoObjectCommon* ch, int channelIndex)
@@ -214,11 +219,14 @@ void OriginalRecording::openSpikeFile(File rootFolder, const SpikeChannel* elec,
 
 	if (!fileExists)
 	{
+
 		String header = generateSpikeHeader(elec);
 		fwrite(header.toUTF8(), 1, header.getNumBytesAsUTF8(), spFile);
+		std::cout << "Wrote header." << std::endl;
 	}
 	diskWriteLock.exit();
 	spikeFileArray.set(channelIndex, spFile);
+	std::cout << "Added file." << std::endl;
 
 }
 
@@ -257,8 +265,8 @@ String OriginalRecording::getFileName(int channelIndex)
 {
 	String filename;
 	const DataChannel* ch = getDataChannel(channelIndex);
-
-	filename += String(static_cast<int>(ch->getCurrentNodeID()));
+    
+	filename += String(static_cast<int>(ch->getSourceNodeID()));
 	filename += "_";
 	if (renameFiles)
 		filename += renamedPrefix + String(getDataChannel(channelIndex)->getCurrentNodeChannelIdx() + 1);
@@ -592,6 +600,7 @@ void OriginalRecording::closeFiles()
 		}
 	}
 	fileArray.clear();
+
 	blockIndex.clear();
 	samplesSinceLastTimestamp.clear();
 	for (int i = 0; i < spikeFileArray.size(); i++)
@@ -630,12 +639,18 @@ void OriginalRecording::closeFiles()
 
 void OriginalRecording::writeSpike(int electrodeIndex, const SpikeEvent* spike)
 {
+	//std::cout << "Electrode index: " << electrodeIndex << std::endl;
+
 	if (spikeFileArray[electrodeIndex] == nullptr)
 		return;
 
+	//std::cout << "Got spike" << std::endl;
+
 	HeapBlock<char> spikeBuffer;
 	const SpikeChannel* channel = getSpikeChannel(electrodeIndex);
 
+	//std::cout << "Got spike channel" << std::endl;
+
 	int totalSamples = channel->getTotalSamples() * channel->getNumChannels();
 	int numChannels = channel->getNumChannels();
 	int chanSamples = channel->getTotalSamples();
@@ -658,6 +673,8 @@ void OriginalRecording::writeSpike(int electrodeIndex, const SpikeEvent* spike)
 	zeromem(spikeBuffer.getData() + 32, 2 * sizeof(float));
 	*reinterpret_cast<uint16*>(spikeBuffer.getData() + 40) = channel->getSampleRate();
 
+	//std::cout << "Allocated memory" << std::endl;
+
 	int ptrIdx = 0;
 	uint16* dataIntPtr = reinterpret_cast<uint16*>(spikeBuffer.getData() + 42);
 	const float* spikeDataPtr = spike->getDataPointer();
@@ -683,6 +700,8 @@ void OriginalRecording::writeSpike(int electrodeIndex, const SpikeEvent* spike)
 		ptrIdx += sizeof(int16);
 	}
 
+	//std::cout << "Starting disk write" << std::endl;
+
 	diskWriteLock.enter();
 
 	fwrite(spikeBuffer, 1, totalBytes, spikeFileArray[electrodeIndex]);
@@ -693,6 +712,8 @@ void OriginalRecording::writeSpike(int electrodeIndex, const SpikeEvent* spike)
 		spikeFileArray[electrodeIndex]); // ptr to FILE object
 
 	diskWriteLock.exit();
+
+	//std::cout << "Wrote to file" << std::endl;
 }
 
 void OriginalRecording::writeXml()
diff --git a/Source/Processors/RecordNode/RecordEngine.h b/Source/Processors/RecordNode/RecordEngine.h
index a79e6eb2c..326d56cc9 100644
--- a/Source/Processors/RecordNode/RecordEngine.h
+++ b/Source/Processors/RecordNode/RecordEngine.h
@@ -65,7 +65,7 @@ class PLUGIN_API RecordEngine
 	/** All the public methods (except registerManager) are called by RecordNode or RecordingThread:
 	When acquisition starts (in the specified order):
 	1-resetChannels
-	2-registerProcessor, addChannel, registerSpikeSource, addspikeelectrode
+	2-registerProcessor, addChannel, registerSpikeSource, addSpikeElectrode
 	3-configureEngine (which calls setParameter)
 	3-startAcquisition
 	When recording starts (in the specified order):
diff --git a/Source/Processors/RecordNode/RecordNode.cpp b/Source/Processors/RecordNode/RecordNode.cpp
index 54cf37b34..ff7bd171c 100755
--- a/Source/Processors/RecordNode/RecordNode.cpp
+++ b/Source/Processors/RecordNode/RecordNode.cpp
@@ -2,6 +2,7 @@
 
 #include "../../UI/EditorViewport.h"
 #include "../../UI/ControlPanel.h"
+#include "../../Processors/MessageCenter/MessageCenterEditor.h"
 #include "BinaryFormat/BinaryRecording.h"
 #include "OpenEphysFormat/OriginalRecording.h"
 
@@ -40,7 +41,8 @@ RecordNode::RecordNode()
 	hasRecorded(false),
 	settingsNeeded(false),
 	receivedSoftwareTime(false),
-    numSubprocessors(0)
+    numSubprocessors(0),
+	isConnectedToMessageCenter(false)
 {
 	setProcessorType(PROCESSOR_TYPE_RECORD_NODE);
 
@@ -69,8 +71,28 @@ RecordNode::~RecordNode()
 {
 }
 
+void RecordNode::connectToMessageCenter()
+{
+
+	const EventChannel* orig = AccessClass::getMessageCenter()->messageCenter->getMessageChannel();
+
+	for (auto eventChannel : eventChannelArray)
+	{
+		if (eventChannel == orig)
+			return;
+	}
+
+	eventChannelArray.add(new EventChannel(*orig));
+	
+	isConnectedToMessageCenter = true;
+
+	std::cout << "Record node " << getNodeId() << " connected to Message Center" << std::endl;
+
+}
+
 void RecordNode::addInputChannel(const GenericProcessor* sourceNode, int chan)
 {
+	// not getting called
 
 	if (chan != AccessClass::getProcessorGraph()->midiChannelIndex)
 	{
@@ -85,7 +107,6 @@ void RecordNode::addInputChannel(const GenericProcessor* sourceNode, int chan)
 	}
 	else
 	{
-
 		for (int n = 0; n < sourceNode->getTotalEventChannels(); n++)
 		{
 			const EventChannel* orig = sourceNode->getEventChannel(n);
@@ -151,7 +172,7 @@ String RecordNode::generateDirectoryName()
 
 	AccessClass::getControlPanel()->setDateText(datestring);
 
-	if (filename.length() < 24)
+	if (filename.length() < 24) // this is a hack
 		filename += datestring;
 	else
 		filename = filename.substring(0, filename.length() - 1);
@@ -162,23 +183,27 @@ String RecordNode::generateDirectoryName()
 
 }
 
+// called by FifoMonitor
 File RecordNode::getDataDirectory()
 {
 	return dataDirectory;
 }
 
+// called by RecordNodeEditor
 void RecordNode::setDataDirectory(File directory)
 {
 	dataDirectory = directory;
 	newDirectoryNeeded = true;
 }
 
+// called by RecordNode::startRecording and RHD2000Editor (should be removed)
 void RecordNode::createNewDirectory()
 {
 	rootFolder = File(dataDirectory.getFullPathName() + File::separator + generateDirectoryName() + File::separator + getName() + " " + String(getNodeId()));
 	newDirectoryNeeded = false;
 }
 
+// called by RecordEngine
 String RecordNode::generateDateString() const
 {
 
@@ -214,35 +239,42 @@ String RecordNode::generateDateString() const
 
 }
 
+// called by CoreServices
 int RecordNode::getExperimentNumber() const
 {
 	LOGD(__FUNCTION__, " = ", experimentNumber);
 	return experimentNumber;
 }
 
+// called by CoreServices
 int RecordNode::getRecordingNumber() const
 {
 	LOGD(__FUNCTION__, " = ", recordingNumber);
 	return recordingNumber;
 }
 
+// called by ProcessorGraph::createNewProcessor
 AudioProcessorEditor* RecordNode::createEditor()
 {
 	editor = new RecordNodeEditor(this, true);
 	return editor;
 }
 
+// Juce method, not used
 void RecordNode::prepareToPlay(double sampleRate, int estimatedSamplesPerBlock)
 {
 	/* This gets called right when the play button is pressed*/
 }
 
+// called by RecordEngine when saving the signal chain
 const String &RecordNode::getLastSettingsXml() const
 {
 	return lastSettingsText;
 }
 
-/* Use this function to change paramaters while recording...*/
+/* Use this function to change parameters while recording...*/
+// Called by:
+// - EngineConfigComponent (3, 0.0f) -- used to disable record thread (deprecated?)
 void RecordNode::setParameter(int parameterIndex, float newValue)
 {
 	editor->updateParameterButtons(parameterIndex);
@@ -255,19 +287,23 @@ void RecordNode::setParameter(int parameterIndex, float newValue)
 
 }
 
+// Called by ProcessorGraph::enableProcessors()
 void RecordNode::updateRecordChannelIndexes()
 {
 	//Keep the nodeIDs of the original processor from each channel comes from
 	updateChannelIndexes(false);
 }
 
+// Called when deleting FifoMonitor
 void RecordNode::updateChannelStates(int srcIndex, int subProcIdx, std::vector<bool> channelStates)
 {
 	this->dataChannelStates[srcIndex][subProcIdx] = channelStates;
 }
 
+// called by updateSettings (could be refactored)
 void RecordNode::updateSubprocessorMap()
 {
+
     
     std::map<int, std::vector<int>> inputs;
 
@@ -341,6 +377,8 @@ void RecordNode::updateSubprocessorMap()
     eventMap.clear();
     syncChannelMap.clear();
     syncOrderMap.clear();
+
+	LOGD("Record Node: ", getNodeId(), " has ", eventChannelArray.size(), " channels");
     for (int ch = 0; ch < eventChannelArray.size(); ch++)
     {
 
@@ -358,36 +396,42 @@ void RecordNode::updateSubprocessorMap()
         }
 
     }
-
 }
 
+// called by GenericProcessor, RecordNodeEditor, SourceProcessorInfo,
+// TimestampSourceSelectionComponent
 int RecordNode::getNumSubProcessors() const
 {
 	return numSubprocessors;
 }
 
+// called by RecordNodeEditor (when loading), SyncControlButton
 void RecordNode::setMasterSubprocessor(int srcIndex, int subProcIdx)
 {
 	synchronizer->setMasterSubprocessor(srcIndex, subProcIdx);
 }
 
+// called by RecordNodeEditor (when loading), SyncControlButton
 void RecordNode::setSyncChannel(int srcIndex, int subProcIdx, int channel)
 {
 	syncChannelMap[srcIndex][subProcIdx] = channel;
 	synchronizer->setSyncChannel(srcIndex, subProcIdx, syncOrderMap[srcIndex][subProcIdx]+channel);
 }
 
+// called by SyncControlButton
 int RecordNode::getSyncChannel(int srcIndex, int subProcIdx)
 {
 	return syncChannelMap[srcIndex][subProcIdx];
 	//return synchronizer->getSyncChannel(srcIndex, subProcIdx);
 }
 
+// called by SyncControlButton
 bool RecordNode::isMasterSubprocessor(int srcIndex, int subProcIdx)
 {
 	return (srcIndex == synchronizer->masterProcessor && subProcIdx == synchronizer->masterSubprocessor);
 }
 
+// called by GenericProcessor::update()
 void RecordNode::updateSettings()
 {
 
@@ -395,9 +439,12 @@ void RecordNode::updateSettings()
 
 }
 
+// called by GenericProcessor::enableProcessor
 bool RecordNode::enable()
 {
 
+	//connectToMessageCenter();
+	
 	if (hasRecorded)
 	{
 		hasRecorded = false;
@@ -414,6 +461,7 @@ bool RecordNode::enable()
 
 }
 
+// called by GenericProcessor::setRecording()
 void RecordNode::startRecording()
 {
 
@@ -439,6 +487,8 @@ void RecordNode::startRecording()
 		int srcIndex = chan->getSourceNodeID();
 		int subIndex = chan->getSubProcessorIdx();
 
+		//std::cout << "Channel: " << ch << " Source Node: " << srcIndex << " Sub Index: " << subIndex << std::endl;
+
 		if (dataChannelStates[srcIndex][subIndex][dataChannelOrder[ch]])
 		{
 
@@ -484,6 +534,8 @@ void RecordNode::startRecording()
 
 	hasRecorded = true;
 
+	
+
 	/* Set write properties */
 	setFirstBlock = false;
 
@@ -510,19 +562,18 @@ void RecordNode::startRecording()
 			rootFolder.createDirectory();
 		}
 		
-		//TODO:
-		/*
 		if (settingsNeeded)
 		{
 			String settingsFileName = rootFolder.getFullPathName() + File::separator + "settings" + ((experimentNumber > 1) ? "_" + String(experimentNumber) : String::empty) + ".xml";
-			AccessClass::getEditorViewport()->saveState(File(settingsFileName), m_lastSettingsText);
+			AccessClass::getEditorViewport()->saveState(File(settingsFileName), lastSettingsText);
 			settingsNeeded = false;
 		}
-		*/
 
 		useSynchronizer = static_cast<RecordNodeEditor*> (getEditor())->getSelectedEngineIdx() == 0;
 
 		recordThread->setFileComponents(rootFolder, experimentNumber, recordingNumber);
+
+		std::cout << "Num event channels: " << eventChannelArray.size() << std::endl;
 		recordThread->startThread();
 		isRecording = true;
 	}
@@ -531,6 +582,7 @@ void RecordNode::startRecording()
 
 }
 
+// called by GenericProcessor::setRecording()
 void RecordNode::stopRecording()
 {
 
@@ -538,7 +590,7 @@ void RecordNode::stopRecording()
 	if (recordThread->isThreadRunning())
 	{
 		recordThread->signalThreadShouldExit();
-		recordThread->waitForThreadToExit(200); //2000
+		recordThread->waitForThreadToExit(2000); //2000
 	}
 
 	eventMonitor->displayStatus();
@@ -558,10 +610,24 @@ void RecordNode::setRecordSpikes(bool recordSpikes)
 void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& event, int samplePosition)
 {
 
+	//Ignore any duplicate messages from MessageCenter
+	if (Event::getSourceID(event) > 900)
+	{
+		if (!msgCenterMessages.contains(Event::getTimestamp(event)))
+		{
+			msgCenterMessages.add(Event::getTimestamp(event));
+			std::cout << "Received message." << std::endl;
+		}
+		else
+			return;
+	}
+
 	eventMonitor->receivedEvents++;
 
 	if (recordEvents) 
 	{
+		// flags whether or not to write events
+
 		int64 timestamp = Event::getTimestamp(event);
 		uint64 eventChan = event.getChannel();
 		int eventIndex;
@@ -580,11 +646,10 @@ void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& e
 
 }
 
-
+// only called if recordSpikes is true
 void RecordNode::handleSpike(const SpikeChannel* spikeInfo, const MidiMessage& event, int samplePosition)
 {
-
-
+    
 	SpikeEventPtr newSpike = SpikeEvent::deserializeFromMessage(event, spikeInfo);
 	if (!newSpike) 
 	{
@@ -705,11 +770,13 @@ void RecordNode::process(AudioSampleBuffer& buffer)
 
 }
 
+// called by process method
 bool RecordNode::isFirstChannelInRecordedSubprocessor(int ch)
 {
 	return std::find(startRecChannels.begin(), startRecChannels.end(), ch) != startRecChannels.end();
 }
 
+// called by ProcessorGraph::connectProcessors
 void RecordNode::registerProcessor(const GenericProcessor* sourceNode)
 {
 	settings.numInputs += sourceNode->getNumOutputs();
@@ -717,11 +784,13 @@ void RecordNode::registerProcessor(const GenericProcessor* sourceNode)
 	recordEngine->registerProcessor(sourceNode);
 }
 
+// not called
 void RecordNode::registerSpikeSource(const GenericProcessor *processor)
 {
 	recordEngine->registerSpikeSource(processor);
 }
 
+// not called
 int RecordNode::addSpikeElectrode(const SpikeChannel *elec)
 {
 	spikeChannelArray.add(new SpikeChannel(*elec));
@@ -729,6 +798,7 @@ int RecordNode::addSpikeElectrode(const SpikeChannel *elec)
 	return spikeElectrodeIndex++;
 }
 
+// called in RecordNode::handleSpike
 void RecordNode::writeSpike(const SpikeEvent *spike, const SpikeChannel *spikeElectrode)
 {
 	//if (isRecording && shouldRecord)
@@ -741,6 +811,7 @@ void RecordNode::writeSpike(const SpikeEvent *spike, const SpikeChannel *spikeEl
 	}
 }
 
+// FileNameComponent listener
 void RecordNode::filenameComponentChanged(FilenameComponent *fnc)
 {
 
@@ -748,16 +819,19 @@ void RecordNode::filenameComponentChanged(FilenameComponent *fnc)
 	newDirectoryNeeded = true;
 }
 
+// not called?
 float RecordNode::getFreeSpace() const
 {
 	return 1.0f - float(dataDirectory.getBytesFreeOnVolume()) / float(dataDirectory.getVolumeTotalSize());
 }
 
+// not called?
 void RecordNode::registerRecordEngine(RecordEngine *engine)
 {
 	engineArray.add(engine);
 }
 
+// not called?
 void RecordNode::clearRecordEngines()
 {
 	engineArray.clear();
diff --git a/Source/Processors/RecordNode/RecordNode.h b/Source/Processors/RecordNode/RecordNode.h
index 36834c64d..2f7ef710d 100755
--- a/Source/Processors/RecordNode/RecordNode.h
+++ b/Source/Processors/RecordNode/RecordNode.h
@@ -46,9 +46,23 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
 
 public:
 
+    /** Constructor
+      - Creates: DataQueue, EventQueue, SpikeQueue, Synchronizer,
+        RecordThread, EventMonitor
+      - Sets the Record Engine
+      - Gets the Recording Directory from the control panel
+      - Sets a bunch of internal variables
+     */
 	RecordNode();
+    
+    /** Destructor
+            - Doesn't need to delete anything manually
+     */
 	~RecordNode();
 
+    /** If messageCenter event channel is not present in EventChannelArray, add it*/
+	void connectToMessageCenter();
+
 	void updateRecordChannelIndexes();
 
 	AudioProcessorEditor* createEditor() override;
@@ -125,6 +139,7 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
     bool isSyncReady;
 
     //TODO: Need to validate these new methods
+    /** Deprecated*/
 	void addInputChannel(const GenericProcessor* sourceNode, int chan);
 
     /** Must be called by a spike recording source on the "enable" method
@@ -167,6 +182,9 @@ class RecordNode : public GenericProcessor, public FilenameComponentListener
 
 private:
 
+	bool isConnectedToMessageCenter;
+	Array<int64> msgCenterMessages;
+
 	bool useSynchronizer; 
 
 	bool receivedSoftwareTime;
diff --git a/Source/Processors/RecordNode/RecordThread.cpp b/Source/Processors/RecordNode/RecordThread.cpp
index 392874580..c0fbb7dbe 100644
--- a/Source/Processors/RecordNode/RecordThread.cpp
+++ b/Source/Processors/RecordNode/RecordThread.cpp
@@ -210,10 +210,10 @@ void RecordThread::writeSynchronizedData(const AudioSampleBuffer& dataBuffer, co
 
 	for (int sp = 0; sp < nSpikes; ++sp)
 	{
-		if (spikes[sp] == NULL)
-			std::cout << "Got NULL" << std::endl;
-		else
+		if (spikes[sp] != NULL)
+		{
 			m_engine->writeSpike(spikes[sp]->getExtra(), &spikes[sp]->getData());
+		}
 		//m_engine->writeSpike(0, &spikes[sp]->getData());
 	}
 }
@@ -279,9 +279,12 @@ void RecordThread::writeData(const AudioSampleBuffer& dataBuffer, int maxSamples
 
 	for (int sp = 0; sp < nSpikes; ++sp)
 	{
-		m_engine->writeSpike(spikes[sp]->getExtra(), &spikes[sp]->getData());
+		if (spikes[sp] != NULL)
+		{
+			m_engine->writeSpike(spikes[sp]->getExtra(), &spikes[sp]->getData());
+		}
 	}
-	
+
 }
 
 void RecordThread::forceCloseFiles()