diff --git a/common/listener.cpp b/common/listener.cpp
index 3e5f46a7..7d7a1c3d 100644
--- a/common/listener.cpp
+++ b/common/listener.cpp
@@ -1,481 +1,481 @@
 /*
  * Copyright (C) 2014 Aaron Seigo <aseigo@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
  */
 
 #include "listener.h"
 
 #include "common/commands.h"
 #include "common/resource.h"
 #include "common/log.h"
 #include "common/definitions.h"
 #include "common/resourcecontext.h"
 #include "common/adaptorfactoryregistry.h"
 #include "common/bufferutils.h"
 
 // commands
 #include "common/commandcompletion_generated.h"
 #include "common/handshake_generated.h"
 #include "common/revisionupdate_generated.h"
 #include "common/notification_generated.h"
 #include "common/revisionreplayed_generated.h"
 #include "common/secret_generated.h"
 
 #include <QLocalServer>
 #include <QLocalSocket>
 #include <QTimer>
 #include <chrono>
 
 Listener::Listener(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType, QObject *parent)
     : QObject(parent),
       m_server(new QLocalServer(this)),
       m_resourceName(resourceType),
       m_resourceInstanceIdentifier(resourceInstanceIdentifier),
       m_clientBufferProcessesTimer(new QTimer(this)),
+      m_checkConnectionsTimer(new QTimer),
       m_messageId(0),
       m_exiting(false)
 {
     connect(m_server.get(), &QLocalServer::newConnection, this, &Listener::acceptConnection);
     SinkTrace() << "Trying to open " << m_resourceInstanceIdentifier;
 
-    if (!m_server->listen(QString::fromLatin1(m_resourceInstanceIdentifier))) {
-        m_server->removeServer(m_resourceInstanceIdentifier);
-        if (!m_server->listen(QString::fromLatin1(m_resourceInstanceIdentifier))) {
-            SinkWarning() << "Utter failure to start server";
-            exit(-1);
-        }
-    }
-
-    if (m_server->isListening()) {
-        SinkTrace() << QString("Listening on %1").arg(m_server->serverName());
-    }
-
-    m_checkConnectionsTimer = std::unique_ptr<QTimer>(new QTimer);
     m_checkConnectionsTimer->setSingleShot(true);
     connect(m_checkConnectionsTimer.get(), &QTimer::timeout, [this]() {
         if (m_connections.isEmpty()) {
             SinkTrace() << QString("No connections, shutting down.");
             quit();
         }
     });
     //Give plenty of time during the first start.
     m_checkConnectionsTimer->start(std::chrono::milliseconds{60000});
 
     // TODO: experiment with different timeouts
     //      or even just drop down to invoking the method queued? => invoke queued unless we need throttling
     m_clientBufferProcessesTimer->setInterval(0);
     m_clientBufferProcessesTimer->setSingleShot(true);
     connect(m_clientBufferProcessesTimer.get(), &QTimer::timeout, this, &Listener::processClientBuffers);
+
+    if (!m_server->listen(QString::fromLatin1(m_resourceInstanceIdentifier))) {
+        m_server->removeServer(m_resourceInstanceIdentifier);
+        if (!m_server->listen(QString::fromLatin1(m_resourceInstanceIdentifier))) {
+            SinkWarning() << "Utter failure to start server";
+            exit(-1);
+        }
+    }
+
+    if (m_server->isListening()) {
+        SinkTrace() << QString("Listening on %1").arg(m_server->serverName());
+    }
 }
 
 Listener::~Listener()
 {
     SinkTrace() << "Shutting down " << m_resourceInstanceIdentifier;
     closeAllConnections();
 }
 
 void Listener::checkForUpgrade()
 {
     if (loadResource().checkForUpgrade()) {
         //Close the resource to ensure no transactions are open
         m_resource.reset(nullptr);
     }
 }
 
 void Listener::emergencyAbortAllConnections()
 {
     for (Client &client : m_connections) {
         if (client.socket) {
             SinkWarning() << "Sending panic";
             client.socket->write("PANIC");
             client.socket->waitForBytesWritten();
             disconnect(client.socket, nullptr, this, nullptr);
             client.socket->abort();
             delete client.socket;
             client.socket = nullptr;
         }
     }
 
     m_connections.clear();
 }
 
 void Listener::closeAllConnections()
 {
     for (Client &client : m_connections) {
         if (client.socket) {
             disconnect(client.socket, nullptr, this, nullptr);
             client.socket->flush();
             client.socket->close();
             delete client.socket;
             client.socket = nullptr;
         }
     }
 
     m_connections.clear();
 }
 
 void Listener::acceptConnection()
 {
     SinkTrace() << "Accepting connection";
     QLocalSocket *socket = m_server->nextPendingConnection();
 
     if (!socket) {
         SinkWarning() << "Accepted connection but didn't get a socket for it";
         return;
     }
 
     m_connections << Client("Unknown Client", socket);
     connect(socket, &QIODevice::readyRead, this, &Listener::onDataAvailable);
     connect(socket, &QLocalSocket::disconnected, this, &Listener::clientDropped);
     m_checkConnectionsTimer->stop();
 
     // If this is the first client, set the lower limit for revision cleanup
     if (m_connections.size() == 1) {
         loadResource().setLowerBoundRevision(0);
     }
 
     if (socket->bytesAvailable()) {
         readFromSocket(socket);
     }
 }
 
 void Listener::clientDropped()
 {
     QLocalSocket *socket = qobject_cast<QLocalSocket *>(sender());
     if (!socket) {
         return;
     }
 
     bool dropped = false;
     QMutableVectorIterator<Client> it(m_connections);
     while (it.hasNext()) {
         const Client &client = it.next();
         if (client.socket == socket) {
             dropped = true;
             SinkLog() << QString("Dropped connection: %1").arg(client.name) << socket;
             it.remove();
             break;
         }
     }
     if (!dropped) {
         SinkWarning() << "Failed to find connection for disconnected socket: " << socket;
     }
 
     checkConnections();
 }
 
 void Listener::checkConnections()
 {
     // If this was the last client, disengage the lower limit for revision cleanup
     if (m_connections.isEmpty()) {
         loadResource().setLowerBoundRevision(std::numeric_limits<qint64>::max());
     }
     m_checkConnectionsTimer->start(std::chrono::milliseconds{1000});
 }
 
 void Listener::onDataAvailable()
 {
     QLocalSocket *socket = qobject_cast<QLocalSocket *>(sender());
     if (!socket || m_exiting) {
         return;
     }
     readFromSocket(socket);
 }
 
 void Listener::readFromSocket(QLocalSocket *socket)
 {
     SinkTrace() << "Reading from socket...";
     for (Client &client : m_connections) {
         if (client.socket == socket) {
             client.commandBuffer += socket->readAll();
             if (!m_clientBufferProcessesTimer->isActive()) {
                 m_clientBufferProcessesTimer->start();
             }
             break;
         }
     }
 }
 
 void Listener::processClientBuffers()
 {
     // TODO: we should not process all clients, but iterate async over them and process
     //      one command from each in turn to ensure all clients get fair handling of
     //      commands?
     bool again = false;
     for (Client &client : m_connections) {
         if (!client.socket || !client.socket->isValid() || client.commandBuffer.isEmpty()) {
             continue;
         }
 
         if (processClientBuffer(client)) {
             again = true;
         }
     }
 
     if (again) {
         m_clientBufferProcessesTimer->start();
     }
 }
 
 void Listener::processCommand(int commandId, uint messageId, const QByteArray &commandBuffer, Client &client, const std::function<void(bool)> &callback)
 {
     bool success = true;
     switch (commandId) {
         case Sink::Commands::HandshakeCommand: {
             flatbuffers::Verifier verifier((const uint8_t *)commandBuffer.constData(), commandBuffer.size());
             if (Sink::Commands::VerifyHandshakeBuffer(verifier)) {
                 auto buffer = Sink::Commands::GetHandshake(commandBuffer.constData());
                 client.name = buffer->name()->c_str();
             } else {
                 SinkWarning() << "received invalid command";
             }
             break;
         }
         case Sink::Commands::SecretCommand: {
             flatbuffers::Verifier verifier((const uint8_t *)commandBuffer.constData(), commandBuffer.size());
             if (Sink::Commands::VerifySecretBuffer(verifier)) {
                 auto buffer = Sink::Commands::GetSecret(commandBuffer.constData());
                 loadResource().setSecret(QString{buffer->secret()->c_str()});
             } else {
                 SinkWarning() << "received invalid command";
             }
             break;
         }
 
         case Sink::Commands::SynchronizeCommand:
         case Sink::Commands::InspectionCommand:
         case Sink::Commands::DeleteEntityCommand:
         case Sink::Commands::ModifyEntityCommand:
         case Sink::Commands::CreateEntityCommand:
         case Sink::Commands::FlushCommand:
         case Sink::Commands::AbortSynchronizationCommand:
             SinkTrace() << "Command id  " << messageId << " of type \"" << Sink::Commands::name(commandId) << "\" from " << client.name;
             loadResource().processCommand(commandId, commandBuffer);
             break;
         case Sink::Commands::ShutdownCommand:
             SinkLog() << QString("Received shutdown command from %1").arg(client.name);
             m_exiting = true;
             break;
         case Sink::Commands::PingCommand:
             SinkTrace() << QString("Received ping command from %1").arg(client.name);
             break;
         case Sink::Commands::RevisionReplayedCommand: {
             SinkTrace() << QString("Received revision replayed command from %1").arg(client.name);
             flatbuffers::Verifier verifier((const uint8_t *)commandBuffer.constData(), commandBuffer.size());
             if (Sink::Commands::VerifyRevisionReplayedBuffer(verifier)) {
                 auto buffer = Sink::Commands::GetRevisionReplayed(commandBuffer.constData());
                 client.currentRevision = buffer->revision();
             } else {
                 SinkWarning() << "received invalid command";
             }
             loadResource().setLowerBoundRevision(lowerBoundRevision());
         }
         break;
         case Sink::Commands::RemoveFromDiskCommand: {
             SinkLog() << QString("Received a remove from disk command from %1").arg(client.name);
             //Close the resource to ensure no transactions are open
             m_resource.reset(nullptr);
             if (Sink::ResourceFactory *resourceFactory = Sink::ResourceFactory::load(m_resourceName)) {
                 resourceFactory->removeDataFromDisk(m_resourceInstanceIdentifier);
             }
             m_exiting = true;
         } break;
         case Sink::Commands::UpgradeCommand:
             //Because we synchronously run the update directly on resource start, we know that the upgrade is complete once this message completes.
             break;
         default:
             if (commandId > Sink::Commands::CustomCommand) {
                 SinkLog() << QString("Received custom command from %1: ").arg(client.name) << commandId;
                 loadResource().processCommand(commandId, commandBuffer);
             } else {
                 success = false;
                 SinkError() << QString("\tReceived invalid command from %1: ").arg(client.name) << commandId;
             }
             break;
     }
     callback(success);
 }
 
 qint64 Listener::lowerBoundRevision()
 {
     qint64 lowerBound = 0;
     for (const Client &c : m_connections) {
         if (c.currentRevision > 0) {
             if (lowerBound == 0) {
                 lowerBound = c.currentRevision;
             } else {
                 lowerBound = qMin(c.currentRevision, lowerBound);
             }
         }
     }
     return lowerBound;
 }
 
 void Listener::sendShutdownNotification()
 {
     // Broadcast shutdown notifications to open clients, so they don't try to restart the resource
     auto command = Sink::Commands::CreateNotification(m_fbb, Sink::Notification::Shutdown);
     Sink::Commands::FinishNotificationBuffer(m_fbb, command);
     for (Client &client : m_connections) {
         if (client.socket && client.socket->isOpen()) {
             Sink::Commands::write(client.socket, ++m_messageId, Sink::Commands::NotificationCommand, m_fbb);
         }
     }
 }
 
 void Listener::quit()
 {
     SinkTrace() << "Quitting " << m_resourceInstanceIdentifier;
     m_clientBufferProcessesTimer->stop();
     m_server->close();
     sendShutdownNotification();
     closeAllConnections();
     m_fbb.Clear();
 
     QTimer::singleShot(0, this, [this]() {
         // This will destroy this object
         emit noClients();
     });
 }
 
 bool Listener::processClientBuffer(Client &client)
 {
     static const int headerSize = Sink::Commands::headerSize();
     if (client.commandBuffer.size() < headerSize) {
         return false;
     }
 
     const uint messageId = *(const uint *)client.commandBuffer.constData();
     const int commandId = *(const int *)(client.commandBuffer.constData() + sizeof(uint));
     const uint size = *(const uint *)(client.commandBuffer.constData() + sizeof(int) + sizeof(uint));
     SinkTrace() << "Received message. Id:" << messageId << " CommandId: " << commandId << " Size: " << size;
 
     // TODO: reject messages above a certain size?
 
     const bool commandComplete = size <= uint(client.commandBuffer.size() - headerSize);
     if (commandComplete) {
         client.commandBuffer.remove(0, headerSize);
 
         auto socket = QPointer<QLocalSocket>(client.socket);
         auto clientName = client.name;
         const QByteArray commandBuffer = client.commandBuffer.left(size);
         client.commandBuffer.remove(0, size);
         processCommand(commandId, messageId, commandBuffer, client, [this, messageId, commandId, socket, clientName](bool success) {
             SinkTrace() << QString("Completed command messageid %1 of type \"%2\" from %3").arg(messageId).arg(QString(Sink::Commands::name(commandId))).arg(clientName);
             if (socket) {
                 sendCommandCompleted(socket.data(), messageId, success);
             } else {
                 SinkLog() << QString("Socket became invalid before we could send a response. client: %1").arg(clientName);
             }
         });
         if (m_exiting) {
             quit();
             return false;
         }
 
         return client.commandBuffer.size() >= headerSize;
     }
 
     return false;
 }
 
 void Listener::sendCommandCompleted(QLocalSocket *socket, uint messageId, bool success)
 {
     if (!socket || !socket->isValid()) {
         return;
     }
 
     auto command = Sink::Commands::CreateCommandCompletion(m_fbb, messageId, success);
     Sink::Commands::FinishCommandCompletionBuffer(m_fbb, command);
     Sink::Commands::write(socket, ++m_messageId, Sink::Commands::CommandCompletionCommand, m_fbb);
     if (m_exiting) {
         socket->waitForBytesWritten();
     }
     m_fbb.Clear();
 }
 
 void Listener::refreshRevision(qint64 revision)
 {
     updateClientsWithRevision(revision);
 }
 
 void Listener::updateClientsWithRevision(qint64 revision)
 {
     auto command = Sink::Commands::CreateRevisionUpdate(m_fbb, revision);
     Sink::Commands::FinishRevisionUpdateBuffer(m_fbb, command);
 
     for (const Client &client : m_connections) {
         if (!client.socket || !client.socket->isValid()) {
             continue;
         }
 
         SinkTrace() << "Sending revision update for " << client.name << revision;
         Sink::Commands::write(client.socket, ++m_messageId, Sink::Commands::RevisionUpdateCommand, m_fbb);
         client.socket->flush();
     }
     m_fbb.Clear();
 }
 
 void Listener::notify(const Sink::Notification &notification)
 {
     auto messageString = m_fbb.CreateString(notification.message.toUtf8().constData(), notification.message.toUtf8().size());
     auto idString = m_fbb.CreateString(notification.id.constData(), notification.id.size());
     auto entities = Sink::BufferUtils::toVector(m_fbb, notification.entities);
     Sink::Commands::NotificationBuilder builder(m_fbb);
     builder.add_type(notification.type);
     builder.add_code(notification.code);
     builder.add_identifier(idString);
     builder.add_message(messageString);
     builder.add_entities(entities);
     builder.add_progress(notification.progress);
     builder.add_total(notification.total);
     auto command = builder.Finish();
     Sink::Commands::FinishNotificationBuffer(m_fbb, command);
     for (Client &client : m_connections) {
         if (client.socket && client.socket->isOpen()) {
             Sink::Commands::write(client.socket, ++m_messageId, Sink::Commands::NotificationCommand, m_fbb);
         }
     }
     m_fbb.Clear();
 }
 
 Sink::Resource &Listener::loadResource()
 {
     if (!m_resource) {
         if (auto resourceFactory = Sink::ResourceFactory::load(m_resourceName)) {
             m_resource = std::unique_ptr<Sink::Resource>(resourceFactory->createResource(Sink::ResourceContext{m_resourceInstanceIdentifier, m_resourceName, Sink::AdaptorFactoryRegistry::instance().getFactories(m_resourceName)}));
             if (!m_resource) {
                 SinkError() << "Failed to instantiate the resource " << m_resourceName;
                 m_resource = std::unique_ptr<Sink::Resource>(new Sink::Resource);
             }
             SinkTrace() << QString("Resource factory: %1").arg((qlonglong)resourceFactory);
             SinkTrace() << QString("\tResource: %1").arg((qlonglong)m_resource.get());
             connect(m_resource.get(), &Sink::Resource::revisionUpdated, this, &Listener::refreshRevision);
             connect(m_resource.get(), &Sink::Resource::notify, this, &Listener::notify);
         } else {
             SinkError() << "Failed to load resource " << m_resourceName;
             m_resource = std::unique_ptr<Sink::Resource>(new Sink::Resource);
         }
     }
     Q_ASSERT(m_resource);
     return *m_resource;
 }
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
 #include "moc_listener.cpp"
 #pragma clang diagnostic pop