diff --git a/messagequeue/hornetqclient/src/main/resources/reference.conf b/messagequeue/hornetqclient/src/main/resources/reference.conf
index 1d6ba53d4..1147a8d80 100644
--- a/messagequeue/hornetqclient/src/main/resources/reference.conf
+++ b/messagequeue/hornetqclient/src/main/resources/reference.conf
@@ -1,24 +1,24 @@
 shrine {
   messagequeue {
     hornetq {
       serverUrl = "https://localhost:6443/shrine-metadata/mom"
       webClientTimeOutSecond = 10 seconds
     }
     httpClient {
-      defaultTimeOutSecond = 10 seconds
+      defaultTimeOut = 10 seconds
       timeOutWaitGap = 1 second
     }
   }
 }
 
 //todo typesafe config precedence seems to do the right thing, but I haven't found the rules that say this reference.conf should override others
 // todo go with the actor system, also check other apps, possiblly they use it too
 akka {
   loglevel = INFO
 
   //  log-config-on-start = on
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   //  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
   // Toggles whether the threads created by this ActorSystem should be daemons or not
   daemonic = on
 }
\ No newline at end of file
diff --git a/messagequeue/hornetqclient/src/main/scala/net/shrine/hornetqclient/HttpClient.scala b/messagequeue/hornetqclient/src/main/scala/net/shrine/hornetqclient/HttpClient.scala
index 0ffa574ac..a9c0d5823 100644
--- a/messagequeue/hornetqclient/src/main/scala/net/shrine/hornetqclient/HttpClient.scala
+++ b/messagequeue/hornetqclient/src/main/scala/net/shrine/hornetqclient/HttpClient.scala
@@ -1,102 +1,102 @@
 package net.shrine.hornetqclient
 
 import java.security.cert.X509Certificate
 import javax.net.ssl.{SSLContext, X509TrustManager}
 import akka.actor.{ActorRef, ActorSystem}
 import akka.io.IO
 import akka.pattern.ask
 import net.shrine.log.Loggable
 import net.shrine.source.ConfigSource
 import net.shrine.config.ConfigExtensions
 import spray.can.Http
 import spray.can.Http.{ConnectionAttemptFailedException, HostConnectorSetup}
 import spray.http.{HttpEntity, HttpRequest, HttpResponse, StatusCodes}
 import spray.io.ClientSSLEngineProvider
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration.{Duration, DurationInt, DurationLong}
 import scala.concurrent.{Await, Future, TimeoutException}
 import scala.language.postfixOps
 import scala.util.control.NonFatal
 
 /**
   * A simple HttpClient to use inside the HttpDirectives
   */
 object HttpClient extends Loggable {
 
   //todo hand back a Try, Failures with custom exceptions instead of a crappy response
   //todo Really a Future would be even better
   def webApiCall(request:HttpRequest,
-                 timeout:Duration = ConfigSource.config.get("shrine.messagequeue.httpClient.defaultTimeOutSecond", Duration(_)))
+                 timeout:Duration = ConfigSource.config.get("shrine.messagequeue.httpClient.defaultTimeOut", Duration(_)))
                 (implicit system: ActorSystem): HttpResponse = {
 
     val deadline = System.currentTimeMillis() + timeout.toMillis
 
     val transport: ActorRef = IO(Http)(system)
 
     debug(s"Requesting $request uri is ${request.uri} path is ${request.uri.path}")
     val future: Future[HttpResponse] = for {
       Http.HostConnectorInfo(connector, _) <- transport.ask(createConnector(request))(deadline - System.currentTimeMillis() milliseconds)
       response <- connector.ask(request)(deadline - System.currentTimeMillis() milliseconds).mapTo[HttpResponse]
     } yield response
     try {
       //wait a second longer than the deadline before timing out the Await, to let the actors timeout
       val timeOutWaitGap = ConfigSource.config.get("shrine.messagequeue.httpClient.timeOutWaitGap", Duration(_)).toMillis
       Await.result(future, deadline + timeOutWaitGap - System.currentTimeMillis() milliseconds)
     }
     catch {
       //todo definitely need the Try instead of this sloppy replacement of the HttpResponse.
       case x: TimeoutException => {
         debug(s"${request.uri} failed with ${x.getMessage}", x)
         HttpResponse(status = StatusCodes.RequestTimeout, entity = HttpEntity(s"${request.uri} timed out after ${timeout}. ${x.getMessage}"))
       }
       //todo is there a better message? What comes up in real life?
       case x: ConnectionAttemptFailedException => {
         //no web service is there to respond
         debug(s"${request.uri} failed with ${x.getMessage}", x)
         HttpResponse(status = StatusCodes.NotFound, entity = HttpEntity(s"${request.uri} failed with ${x.getMessage}"))
       }
       case NonFatal(x) => {
         debug(s"${request.uri} failed with ${x.getMessage}", x)
         HttpResponse(status = StatusCodes.InternalServerError, entity = HttpEntity(s"${request.uri} failed with ${x.getMessage}"))
       }
     }
   }
 
   //from https://github.com/TimothyKlim/spray-ssl-poc/blob/master/src/main/scala/Main.scala
   //trust all SSL contexts. We just want encrypted comms.
   implicit val trustfulSslContext: SSLContext = {
 
     class IgnoreX509TrustManager extends X509TrustManager {
       def checkClientTrusted(chain: Array[X509Certificate], authType: String) {}
 
       def checkServerTrusted(chain: Array[X509Certificate], authType: String) {}
 
       def getAcceptedIssuers = null
     }
 
     val context = SSLContext.getInstance("TLS")
     context.init(null, Array(new IgnoreX509TrustManager), null)
     info("trustfulSslContex initialized")
     context
   }
 
   implicit val clientSSLEngineProvider =
   //todo lookup this constructor
     ClientSSLEngineProvider {
       _ =>
         val engine = trustfulSslContext.createSSLEngine()
         engine.setUseClientMode(true)
         engine
     }
 
   def createConnector(request: HttpRequest) = {
 
     val connector = new HostConnectorSetup(host = request.uri.authority.host.toString,
       port = request.uri.effectivePort,
       sslEncryption = request.uri.scheme == "https",
       defaultHeaders = request.headers)
     connector
   }
 
 }
diff --git a/messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQMomWebApi.scala b/messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQMomWebApi.scala
index b6444a180..7c07c983a 100644
--- a/messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQMomWebApi.scala
+++ b/messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQMomWebApi.scala
@@ -1,301 +1,321 @@
 package net.shrine.hornetqmom
 
 import java.util.UUID
+
 import net.shrine.config.ConfigExtensions
+import net.shrine.hornetqmom.LocalHornetQMom.LocalHornetQMessage
 import net.shrine.log.{Log, Loggable}
 import net.shrine.messagequeueservice.{Message, Queue}
 import net.shrine.problem.{AbstractProblem, ProblemSources}
 import net.shrine.source.ConfigSource
 import org.json4s.native.Serialization
 import org.json4s.native.Serialization.write
 import org.json4s.{NoTypeHints, ShortTypeHints}
 import spray.http.StatusCodes
 import spray.routing.{HttpService, Route}
 
 import scala.collection.concurrent.TrieMap
 import scala.collection.immutable.Seq
 import scala.concurrent.duration.Duration
 import scala.util.control.NonFatal
 import scala.util.{Failure, Success, Try}
 /**
   * A web API that provides access to the internal HornetQMom library.
   * Allows client to createQueue, deleteQueue, sendMessage, receiveMessage, getQueues, and sendReceipt
   *
   * Created by yifan on 7/24/17.
   */
 
 trait HornetQMomWebApi extends HttpService
   with Loggable {
 
   def enabled: Boolean = ConfigSource.config.getBoolean("shrine.messagequeue.hornetQWebApi.enabled")
   val warningMessage: String = "If you intend for this node to serve as this SHRINE network's messaging hub " +
                         "set shrine.messagequeue.hornetQWebApi.enabled to true in your shrine.conf." +
                         " You do not want to do this unless you are the hub admin!"
 
   // keep a map of messages and ids
   private val idToMessages: TrieMap[UUID, (Message, Long)] = TrieMap.empty
 
   case class MapSentinelRunner(timeOutInMillis: Long) extends Runnable {
     // watches the map
     override def run(): Unit = {
       val currentTimeInMillis = System.currentTimeMillis()
       try {
         Log.debug("About to clean up outstanding messages.")
         idToMessages.retain({ (uuid, localHornetQMessageAndCreatedTime) =>
           (currentTimeInMillis - localHornetQMessageAndCreatedTime._2) < timeOutInMillis
         })
         Log.debug(s"Outstanding messages that exceed $timeOutInMillis milliseconds have been cleaned from the map.")
       } catch {
         case NonFatal(x) => ExceptionWhileCleaningUpMessageProblem(timeOutInMillis, x)
         //pass-through to blow up the thread, receive no more results, do something dramatic in UncaughtExceptionHandler.
         case x => Log.error("Fatal exception while cleaning up outstanding messages", x)
           throw x
       }
     }
   }
 
   def momRoute: Route = pathPrefix("mom") {
 
     if (!enabled) {
       val configProblem: CannotUseHornetQMomWebApiProblem = CannotUseHornetQMomWebApiProblem(new UnsupportedOperationException)
       warn(s"HornetQMomWebApi is not available to use due to configProblem ${configProblem.description}!")
       respondWithStatus(StatusCodes.NotFound) {
         complete(warningMessage)
       }
     } else {
       put {
         createQueue ~
           sendMessage ~
           acknowledge
       } ~ receiveMessage ~ getQueues ~ deleteQueue
     }
   }
 
   // SQS returns CreateQueueResult, which contains queueUrl: String
   def createQueue: Route =
     path("createQueue" / Segment) { queueName =>
       detach() {
         val createdQueueTry: Try[Queue] = LocalHornetQMom.createQueueIfAbsent(queueName)
         createdQueueTry match {
           case Success(queue) => {
             implicit val formats = Serialization.formats(NoTypeHints)
             val response: String = write[Queue](queue)(formats)
             respondWithStatus(StatusCodes.Created) {
               complete(response)
             }
           }
           case Failure(x) => {
             internalServerErrorOccured(x, "createQueue")
           }
         }
       }
     }
 
   // SQS takes in DeleteMessageRequest, which contains a queueUrl: String and a ReceiptHandle: String
   // returns a DeleteMessageResult, toString for debugging
   def deleteQueue: Route = path("deleteQueue" / Segment) { queueName =>
     put {
       detach() {
         val deleteQueueTry: Try[Unit] = LocalHornetQMom.deleteQueue(queueName)
         deleteQueueTry match {
           case Success(v) => {
             complete(StatusCodes.OK)
           }
           case Failure(x) => {
             internalServerErrorOccured(x, "deleteQueue")
           }
         }
       }
     }
   }
 
   // SQS sendMessage(String queueUrl, String messageBody) => SendMessageResult
   def sendMessage: Route = path("sendMessage" / Segment) { toQueue =>
     requestInstance { request =>
       val messageContent = request.entity.asString
 
       debug(s"sendMessage to $toQueue '$messageContent'")
 
       detach() {
         val sendTry: Try[Unit] = LocalHornetQMom.send(messageContent, Queue(toQueue))
         sendTry match {
           case Success(v) => {
             complete(StatusCodes.Accepted)
           }
           case Failure(x) => {
             internalServerErrorOccured(x, "sendMessage")
           }
         }
       }
     }
   }
 
   // SQS ReceiveMessageResult receiveMessage(String queueUrl)
   def receiveMessage: Route =
     get {
       path("receiveMessage" / Segment) { fromQueue =>
         parameter('timeOutSeconds ? 20) { timeOutSeconds =>
           val timeout: Duration = Duration.create(timeOutSeconds, "seconds")
           detach() {
             val receiveTry: Try[Option[Message]] = LocalHornetQMom.receive(Queue(fromQueue), timeout)
             receiveTry match {
               case Success(optionMessage) => {
                 optionMessage.fold(complete(StatusCodes.NotFound)){localHornetQMessage =>
                   // add message in the map with an unique UUID
                   val msgID = UUID.randomUUID()
-                  idToMessages.getOrElseUpdate(msgID, (localHornetQMessage, System.currentTimeMillis()))
-                  sentinelScheduler()
+                  scheduleCleanupMessageMap(msgID, localHornetQMessage)
                   complete(MessageContainer(msgID.toString, localHornetQMessage.contents).toJson)
                 }
               }
               case Failure(x) => {
                 internalServerErrorOccured(x, "receiveMessage")
               }
             }
           }
         }
       }
     }
 
-  private def sentinelScheduler() = {
+  private def scheduleCleanupMessageMap(msgID: UUID, localHornetQMessage: Message) = {
     import java.util.concurrent.Executors
     import java.util.concurrent.ScheduledExecutorService
     import java.util.concurrent.TimeUnit
 
+    idToMessages.update(msgID, (localHornetQMessage, System.currentTimeMillis()))
     // a sentinel that monitors the hashmap of idToMessages, any message that has been outstanding for more than 3X or 10X
     // time-to-live need to get cleaned out of this map
     val messageTimeOutInMillis: Long = ConfigSource.config.get("shrine.messagequeue.hornetQWebApi.messageTimeOutSeconds", Duration(_)).toMillis
     val sentinelRunner: MapSentinelRunner = MapSentinelRunner(messageTimeOutInMillis)
     try {
       Log.debug(s"Starting the sentinel scheduler that cleans outstanding messages exceeds 3 times $messageTimeOutInMillis")
       val scheduler: ScheduledExecutorService = Executors.newScheduledThreadPool(1)
       scheduler.schedule(sentinelRunner, messageTimeOutInMillis * 3, TimeUnit.MILLISECONDS)
     } catch {
       case NonFatal(x) => ExceptionWhileSchedulingSentinelProblem(messageTimeOutInMillis, x)
       //pass-through to blow up the thread, receive no more results, do something dramatic in UncaughtExceptionHandler.
       case x => Log.error("Fatal exception while scheduling a sentinel for cleaning up outstanding messages", x)
         throw x
     }
   }
 
   // SQS has DeleteMessageResult deleteMessage(String queueUrl, String receiptHandle)
   def acknowledge: Route = path("acknowledge") {
     entity(as[String]) { messageUUID =>
       detach() {
         val id: UUID = UUID.fromString(messageUUID)
         // retrieve the localMessage from the concurrent hashmap
-        val getMessageTry: Try[Message] = Try {
-          idToMessages(id)
+        val getMessageTry: Try[Option[(Message, Long)]] = Try {
+          idToMessages.remove(id)
         }.transform({ messageAndTime =>
-          Success(messageAndTime._1)
+          Success(messageAndTime)
         }, { throwable =>
           Failure(MessageDoesNotExistException(id))
         })
 
         getMessageTry match {
-          case Success(message) => {
-            message.complete()
-            complete(StatusCodes.ResetContent)
+          case Success(messageAndTimeOption) => {
+            messageAndTimeOption.fold({
+              respondWithStatus(StatusCodes.NotFound) {
+                val noMessageProblem = MessageDoesNotExistInMapProblem(id)
+                complete(noMessageProblem.description)
+              }
+            }) { messageAndTime =>
+              messageAndTime._1.complete()
+              complete(StatusCodes.ResetContent)
+            }
           }
           case Failure(x) => {
             x match {
               case m: MessageDoesNotExistException => {
-                respondWithStatus(StatusCodes.NotFound){ complete(m.getMessage) }
+                respondWithStatus(StatusCodes.NotFound) {
+                  complete(m.getMessage)
+                }
               }
               case _ => internalServerErrorOccured(x, "acknowledge")
             }
           }
         }
       }
     }
   }
 
   // Returns the names of the queues created on this server. Seq[Any]
   def getQueues: Route = path("getQueues") {
     get {
       detach() {
         implicit val formats = Serialization.formats(NoTypeHints)
         respondWithStatus(StatusCodes.OK) {
           val getQueuesTry: Try[Seq[Queue]] = LocalHornetQMom.queues
           getQueuesTry match {
             case Success(seqQueue) => {
               complete(write[Seq[Queue]](LocalHornetQMom.queues.get)(formats))
             }
             case Failure(x) => {
               internalServerErrorOccured(x, "getQueues")
             }
           }
         }
       }
     }
   }
 
   def internalServerErrorOccured(x: Throwable, function: String): Route = {
     respondWithStatus(StatusCodes.InternalServerError) {
       val serverErrorProblem: HornetQMomServerErrorProblem = HornetQMomServerErrorProblem(x, function)
       debug(s"HornetQ encountered a Problem during $function, Problem Details: $serverErrorProblem")
       complete(s"HornetQ throws an exception while trying to $function. HornetQ Server response: ${x.getMessage}" +
         s"Exception is from ${x.getClass}")
     }
   }
 
 }
 
 
 case class MessageContainer(id: String, contents: String) {
   def toJson: String = {
     Serialization.write(this)(MessageContainer.messageFormats)
   }
 }
 
 object MessageContainer {
   val messageFormats = Serialization.formats(ShortTypeHints(List(classOf[MessageContainer])))
 
   def fromJson(jsonString: String): MessageContainer = {
     implicit val formats = messageFormats
     Serialization.read[MessageContainer](jsonString)
   }
 }
 
 
 case class HornetQMomServerErrorProblem(x:Throwable, function:String) extends AbstractProblem(ProblemSources.Hub) {
 
   override val throwable = Some(x)
   override val summary: String = "SHRINE cannot use HornetQMomWebApi due to a server error occurred in hornetQ."
   override val description: String = s"HornetQ throws an exception while trying to $function," +
                                       s" the server's response is: ${x.getMessage} from ${x.getClass}."
 }
 
 case class CannotUseHornetQMomWebApiProblem(x:Throwable) extends AbstractProblem(ProblemSources.Hub) {
 
   override val throwable = Some(x)
   override val summary: String = "SHRINE cannot use HornetQMomWebApi due to configuration in shrine.conf."
   override val description: String = "If you intend for this node to serve as this SHRINE network's messaging hub " +
                               "set shrine.messagequeue.hornetQWebApi.enabled to true in your shrine.conf." +
                               " You do not want to do this unless you are the hub admin!"
 }
 
 case class MessageDoesNotExistException(id: UUID) extends Exception(s"Cannot match given ${id.toString} to any Message in HornetQ server! Message does not exist!")
 
+case class MessageDoesNotExistInMapProblem(id: UUID) extends AbstractProblem(ProblemSources.Hub) {
+
+  override def summary: String = s"The Hub encountered an exception while trying to " +
+    s"find message with the given $id in the process of complete the message!"
+
+  override def description: String = s"The Hub encountered an exception while trying to " +
+    s"find message with the given $id in the process of complete the message." +
+    s" Message either has never been received or already been completed!"
+}
 case class ExceptionWhileCleaningUpMessageProblem(timeOutInMillis: Long, x:Throwable) extends AbstractProblem(ProblemSources.Hub) {
 
   override val throwable = Some(x)
 
   override def summary: String = s"The Hub encountered an exception while trying to " +
     s"cleanup messages that has been outstanding for more than $timeOutInMillis milliseconds"
 
   override def description: String = s"The Hub encountered an exception while trying to " +
     s"cleanup messages that has been received for more than $timeOutInMillis milliseconds " +
     s"on Thread ${Thread.currentThread().getName}: ${x.getMessage}"
 }
 
 case class ExceptionWhileSchedulingSentinelProblem(timeOutInMillis: Long, x:Throwable) extends AbstractProblem(ProblemSources.Hub) {
   override val throwable = Some(x)
 
   override def summary: String = s"The Hub encountered an exception while trying to " +
     s"schedule a sentinel that cleans up outstanding messages exceed $timeOutInMillis milliseconds"
 
   override def description: String = s"The Hub encountered an exception while trying to " +
     s"schedule a sentinel that cleans up outstanding messages exceed $timeOutInMillis milliseconds " +
     s"on Thread ${Thread.currentThread().getName}: ${x.getMessage}"
 }
\ No newline at end of file
diff --git a/shrine-setup/src/main/resources/shrine.conf b/shrine-setup/src/main/resources/shrine.conf
index 027432e10..3e2237709 100644
--- a/shrine-setup/src/main/resources/shrine.conf
+++ b/shrine-setup/src/main/resources/shrine.conf
@@ -1,367 +1,367 @@
 shrine {
   metaData {
     ping = "pong"
   }
   pmEndpoint {
 //    url = "http://shrine-dev1.catalyst/i2b2/services/PMService/getServices" //use your i2b2 pm url
   }
   ontEndpoint {
 //    url = "http://shrine-dev1.catalyst/i2b2/rest/OntologyService/" //use your i2b2 ontology url
   }
   hiveCredentials {
     //use your i2b2 hive credentials
 //    domain = "i2b2demo"
 //    username = "demo"
 //    password = "examplePassword"
 //    crcProjectId = "Demo"
 //    ontProjectId = "SHRINE"
   }
   messagequeue {
     hornetq {
       serverUrl = "https://localhost:6443/shrine-metadata/mom"
     }
     // If you intend for your node to serve as this SHRINE network's messaging hub,
     // then set shrine.messagequeue.hornetQWebApi.enabled to true in your shrine.conf.
     // You do not want to do this unless you are the hub admin
     hornetQWebApi {
       // enabled = false
       // messageTimeOutSeconds = 10 seconds
       // webClientTimeOutSecond = 10 seconds
     }
     httpClient {
-      defaultTimeOutSecond = 10 seconds
+      defaultTimeOut = 10 seconds
       timeOutWaitGap = 1 second
     }
     messagequeue {
 //      receiveWaitTime = "15 seconds"
     }
   }
 
   breakdownResultOutputTypes {
     //use breakdown values appropriate for your shrine network
 //    PATIENT_AGE_COUNT_XML {
 //      description = "Age patient breakdown"
 //    }
 //    PATIENT_RACE_COUNT_XML {
 //      description = "Race patient breakdown"
 //    }
 //    PATIENT_VITALSTATUS_COUNT_XML {
 //      description = "Vital Status patient breakdown"
 //    }
 //    PATIENT_GENDER_COUNT_XML {
 //      description = "Gender patient breakdown"
 //    }
   }
 
   queryEntryPoint {
 //    create = true //false for no qep
 //    audit {
 //      collectQepAudit = true //false to not use the 1.20 audit db tables
 //      database {
 //        dataSourceFrom = "JNDI" //Can be JNDI or testDataSource . Use testDataSource for tests, JNDI everywhere else
 //        jndiDataSourceName = "java:comp/env/jdbc/qepAuditDB" //or leave out for tests
 //        slickProfileClassName = "slick.driver.MySQLDriver$" // Can be
         //        slick.driver.H2Driver$
         //        slick.driver.MySQLDriver$
         //        slick.driver.PostgresDriver$
         //        slick.driver.SQLServerDriver$
         //        slick.driver.JdbcDriver$
         //        freeslick.OracleProfile$
         //        freeslick.MSSQLServerProfile$
         //
         //        (Yes, with the $ on the end)
 
         // For testing without JNDI
         //      testDataSource {
 
         //typical test settings for unit tests
         //driverClassName = "org.h2.Driver"
 
         //url = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" //H2 embedded in-memory for unit tests
         //url = "jdbc:h2:~/stewardTest.h2" //H2 embedded on disk at ~/test
         //      }
 //        timeout = 30 //time to wait before db gives up, in seconds.
 //        createTablesOnStart = false //for testing with H2 in memory, when not running unit tests. Set to false normally
 //      }
 //    }
 //    trustModelIsHub = true  // true by default, false for P2P networks.
 
 //    authenticationType = "pm" //can be none, pm, or ecommons
 
 //    authorizationType = "shrine-steward" //can be none, shrine-steward, or hms-steward
 
     //hms-steward config
     //    sheriffEndpoint {
     //      url = "http://localhost:8080/shrine-hms-authorization/queryAuthorization"
     //      timeout {
     //        seconds = 1
     //      }
     //    }
 
     //    sheriffCredentials {
     //      username = "sheriffUsername"
     //      password = "sheriffPassword"
     //    }
 
     //shrine-steward config
 //    shrineSteward {
 //      qepUserName = "qep"
       //      qepPassword = "trustme"
       //      stewardBaseUrl = "https://localhost:6443"
 //    }
 
     //    includeAggregateResults = false
     //
     //    maxQueryWaitTime {
     //      minutes = 5 //must be longer than the hub's maxQueryWaitTime
     //    }
 
     //    broadcasterServiceEndpoint {
     //      url = "http://example.com/shrine/rest/broadcaster/broadcast" //url for the hub
     //      acceptAllCerts = true
     //      timeout {
     //        seconds = 1
     //      }
     //    }
   }
 
   hub {
 //    create = false //change to true to start a hub
     maxQueryWaitTime {
 //      minutes = 4.5 //Needs to be longer than the adapter's maxQueryWaitTime, but shorter than the qep's
     }
 //    downstreamNodes { //Add your downstream nodes here
 //      shrine-dev2 = "https://shrine-dev2.catalyst:6443/shrine/rest/adapter/requests"
 //    }
     shouldQuerySelf = false //true if there is an adapter at the hub , or just add a loopback address to downstreamNodes
   }
 
   adapter {
 //    create = true by default. False to not create an adapter.
 //    audit {
 //      collectAdapterAudit = true by default. False to not fill in the audit database
 //      database {
 //        dataSourceFrom = "JNDI" //Can be JNDI or testDataSource . Use testDataSource for tests, JNDI everywhere else
 //        jndiDataSourceName = "java:comp/env/jdbc/adapterAuditDB" //or leave out for tests
 //        slickProfileClassName = "slick.driver.MySQLDriver$" // Can be
         //        slick.driver.H2Driver$
         //        slick.driver.MySQLDriver$
         //        slick.driver.PostgresDriver$
         //        slick.driver.SQLServerDriver$
         //        slick.driver.JdbcDriver$
         //        freeslick.OracleProfile$
         //        freeslick.MSSQLServerProfile$
         //
         //        (Yes, with the $ on the end)
 
         // For testing without JNDI
         //      testDataSource {
 
         //typical test settings for unit tests
         //driverClassName = "org.h2.Driver"
 
         //url = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" //H2 embedded in-memory for unit tests
         //url = "jdbc:h2:~/stewardTest.h2" //H2 embedded on disk at ~/test
         //      }
 //        createTablesOnStart = false //for testing with H2 in memory, when not running unit tests. Set to false normally
 //      }
 //    obfuscation {
 //      binSize = 5 by default //Round to the nearest binSize. Use 1 for no effect (to match SHRINE 1.21 and earlier).
 //      sigma = 6.5 by default //Noise to inject. Use 0 for no effect. (Use 1.33 to match SHRINE 1.21 and earlier).
 //      clamp = 10 by default //Maximum ammount of noise to inject. (Use 3 to match SHRINE 1.21 and earlier).
 //    }
 
 //    adapterLockoutAttemptsThreshold = 0 by default // Number of allowed queries with the same actual result that can exist before a researcher is locked out of the adapter. In 1.24 the lockout code and this config value will be removed
 
 //    botDefense {
 //      countsAndMilliseconds = [  //to turn off, use an empty json list
 //        {count = 10, milliseconds = 60000}, //allow up to 10 queries in one minute by default
 //        {count = 200, milliseconds = 36000000} //allow up to 4 queries in 10 hours by default
 //      ]
 //   }
 
     crcEndpoint {
 //must be filled in      url = "http://shrine-dev1.catalyst/i2b2/services/QueryToolService/"
     }
     setSizeObfuscation = true  //must be set. false turns off obfuscation
     adapterMappingsFileName = "AdapterMappings.xml"
     maxSignatureAge {
       minutes = 5 //must be longer than the hub's maxQueryWaitTime
     }
     immediatelyRunIncomingQueries = true //false to queue them
     //delayResponse = "0 seconds" //time to delay before responding to a query. Should be 0 except for testing in shrine-qa
   }
 
   networkStatusQuery = "\\\\SHRINE\\SHRINE\\Demographics\\Gender\\Male\\"
   humanReadableNodeName = "shrine-dev1"
   shrineDatabaseType = "mysql"
 
   keystore {
     file = "/opt/shrine/shrine.keystore"
     password = "changeit"
     privateKeyAlias = "shrine-dev1.catalyst"
     keyStoreType = "JKS"
     caCertAliases = [
       "shrine-dev-ca"
     ]
   }
   problem {
 //    problemHandler = "net.shrine.problem.LogAndDatabaseProblemHandler$" Can be other specialized problemHandler implementations
 //    database {
 //      dataSourceFrom = "JNDI" //Can be JNDI or testDataSource . Use testDataSource for tests, JNDI everywhere else
 //      jndiDataSourceName = "java:comp/env/jdbc/problemDB"
 //      slickProfileClassName = "slick.driver.MySQLDriver$" // Can be
       //        slick.driver.H2Driver$
       //        slick.driver.MySQLDriver$
       //        slick.driver.PostgresDriver$
       //        slick.driver.SQLServerDriver$
       //        slick.driver.JdbcDriver$
       //        freeslick.OracleProfile$
       //        freeslick.MSSQLServerProfile$
       //
       //        (Yes, with the $ on the end)
 
       // For testing without JNDI
       //      testDataSource {
 
       //typical test settings for unit tests
       //driverClassName = "org.h2.Driver"
 
       //url = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" //H2 embedded in-memory for unit tests
       //url = "jdbc:h2:~/stewardTest.h2" //H2 embedded on disk at ~/test
       //      }
 //      createTablesOnStart = false //for testing with H2 in memory, when not running unit tests. Set to false normally
 //    }
   }
   dashboard {
 //    gruntWatch = false //false for production, true for mvn tomcat7:run . Allows the client javascript and html files to be loaded via gruntWatch .
 //    happyBaseUrl = "https://localhost:6443/shrine/rest/happy" If the shine servlet is running on a different machime from the dashboard, change this URL to match
 //    statusBaseUrl = "https://localhost:6443/shrine/rest/internalstatus" If the shine servlet is running on a different machime from the dashboard, change this URL to match
 
 //  }
 //  status {
     //permittedHostOfOrigin = "localhost" //If absent then get the host name via java.net.InetAddress.getLocalHost.getHostName . Override to control
   }
 
 //Get the older squerl-basd databases through JNDI (inside of tomcant, using tomcat's db connection pool) or directly via a db config here (for testing
   squerylDataSource {
 //    database {
 //      dataSourceFrom = "JNDI" //Can be JNDI or testDataSource . Use testDataSource for tests, JNDI everywhere else
 //      jndiDataSourceName = "java:comp/env/jdbc/shrineDB" //or leave out for tests
 //    }
   }
 
   authenticate {
 //    realm = "SHRINE Researcher API" //todo figure out what this means. SHRINE-1978
     usersource {
 //      domain = "i2b2demo"  //you must provide your own domain
     }
   }
   steward {
 
 //    createTopicsMode = Pending  //Can be Pending, Approved, or TopcisIgnoredJustLog. Pending by default
     //Pending - new topics start in the Pending state; researchers must wait for the Steward to approve them
     //Approved - new topics start in the Approved state; researchers can use them immediately
     //TopicsIgnoredJustLog - all queries are logged and approved; researchers don't need to create topics
 
     emailDataSteward {
 //      sendAuditEmails = true  //false to turn off the whole works of emailing the data steward
 //      interval = "1 day" //Audit researchers daily
 //      timeAfterMidnight = "6 hours" //Audit researchers at 6 am. If the interval is less than 1 day then this delay is ignored.
 //      maxQueryCountBetweenAudits = 30 //If a researcher runs more than this many queries since the last audit audit her
 //      minTimeBetweenAudits = "30 days" //If a researcher runs at least one query, audit those queries if this much time has passed
 
       //You must provide the email address of the shrine node system admin, to handle bounces and invalid addresses
       //from = "shrine-admin@example.com"
       //You must provide the email address of the data steward
       //to = "shrine-steward@example.com"
 
 //      subject = "Audit SHRINE researchers"
       //The baseUrl for the data steward to be substituted in to email text. Must be supplied if it is used in the email text.
       //stewardBaseUrl = "https://example.com:8443/steward/"
 
       //Text to use for the email audit.
       // AUDIT_LINES will be replaced by a researcherLine for each researcher to audit.
       // STEWARD_BASE_URL will be replaced by the value in stewardBaseUrl if available.
 //      emailBody = """Please audit the following users at STEWARD_BASE_URL at your earliest convinience:
 //
 //AUDIT_LINES""" //note that this can be a multiline message
 
       //Text to use per researcher to audit.
       //FULLNAME, USERNAME, COUNT and LAST_AUDIT_DATE will be replaced with appropriate text.
 //      researcherLine = "FULLNAME (USERNAME) has run COUNT queries since LAST_AUDIT_DATE."
     }
 
 //    database {
 //      dataSourceFrom = "JNDI" //Can be JNDI or testDataSource . Use testDataSource for tests, JNDI everywhere else
 //      jndiDataSourceName = "java:comp/env/jdbc/stewardDB" //or leave out for tests
 //      slickProfileClassName = "slick.driver.MySQLDriver$" // Can be
       //        slick.driver.H2Driver$
       //        slick.driver.MySQLDriver$
       //        slick.driver.PostgresDriver$
       //        slick.driver.SQLServerDriver$
       //        slick.driver.JdbcDriver$
       //        freeslick.OracleProfile$
       //        freeslick.MSSQLServerProfile$
       //
       //        (Yes, with the $ on the end)
 
       // For testing without JNDI
       //      testDataSource {
 
       //typical test settings for unit tests
       //driverClassName = "org.h2.Driver"
 
       //url = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" //H2 embedded in-memory for unit tests
       //url = "jdbc:h2:~/stewardTest.h2" //H2 embedded on disk at ~/test
       //      }
 //      createTablesOnStart = false // true for testing with H2 in memory, when not running unit tests. Set to false normally
 //    }
 
 //    gruntWatch = false //false for production, true for mvn tomcat7:run . Allows the client javascript and html files to be loaded via gruntWatch .
 
   }
 
   email {
     //add javax mail properties from https://www.tutorialspoint.com/javamail_api/javamail_api_smtp_servers.htm here
 //    javaxmail {
 //      mail {
 //        smtp {
           //for postfix on localhost
 //          host = localhost
 //          port = 25
 
           //for AWS SES - See http://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-using-smtp-java.html
           //        host = email-smtp.us-east-1.amazonaws.com
           //        port = 25
           //        transport.protocol = smtps
           //        auth = true
           //        starttls.enable = true
           //        starttls.required = true
 //        }
 //      }
 //    }
     //Must be set for AWS SES. See http://docs.aws.amazon.com/ses/latest/DeveloperGuide/send-using-smtp-java.html
     //    authenticator {
     //      username = yourUsername
     //      password = yourPassword
     //    }
   }
 }
 
 //Default settings for akka
 //akka {
 //  loglevel = INFO
 
   //  log-config-on-start = on
 //  loggers = ["akka.event.slf4j.Slf4jLogger"]
   // Toggles whether the threads created by this ActorSystem should be daemons or not. Use daemonic inside of tomcat to support shutdown
 //  daemonic = on
 //}
 
 //You'll see these settings for spray, baked into the .war files.
 //spray.servlet {
 //  boot-class = "net.shrine.dashboard.net.shrine.metadata.Boot" //Don't change this one. It'll start the wrong (or no) application if you change it.
 //  request-timeout = 30s
 //}