From c770e696f17e29479bcba9ad10bde17da1776f91 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Tue, 20 Sep 2022 17:50:20 -0700
Subject: [PATCH 01/16] Sanitizer tests (#2439)

* Attempt at fixing the race conditions from callback Federate
Note: these race conditions don't really affect operations

* try some tweaks on the callback tests

* just remove some tests from the sanitizers

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* clang-tidy fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove a few more tests from coverage

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 scripts/run-coverage-tests.sh                 |  6 +--
 .../application_api/AsyncFedCallInfo.hpp      |  2 +-
 src/helics/application_api/Federate.cpp       | 15 +++---
 src/helics/application_api/FederateInfo.cpp   |  2 +-
 src/helics/core/CommonCore.cpp                | 24 +++++----
 src/helics/core/CommonCore.hpp                |  2 +-
 src/helics/core/Core.hpp                      |  3 +-
 src/helics/core/EmptyCore.cpp                 |  5 +-
 src/helics/core/EmptyCore.hpp                 |  2 +-
 src/helics/network/NetworkCommsInterface.cpp  |  2 +-
 .../application_api/CallbackFederateTests.cpp | 52 +++++++++++--------
 .../helics/application_api/FederateTests.cpp  |  8 +--
 tests/helics/core/BrokerClassTests.cpp        |  2 +-
 13 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/scripts/run-coverage-tests.sh b/scripts/run-coverage-tests.sh
index 367bd8cc0b..9b44e946a4 100755
--- a/scripts/run-coverage-tests.sh
+++ b/scripts/run-coverage-tests.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 tests=(
-    ./bin/core-tests
-    ./bin/common-tests
+    "./bin/core-tests --gtest_filter=-*nocov*"
+    "./bin/common-tests --gtest_filter=-*nocov*"
     "./bin/system-tests --gtest_filter=-*nocov*"
     "./bin/helics_apps-tests --gtest_filter=-*nocov*"
     "./bin/shared-library-tests-cpp --gtest_filter=-*death*:*nocov*"
     "./bin/shared-library-tests --gtest_filter=-*death*:*nocov*"
     "./bin/application-api-tests --gtest_filter=-*nocov*"
     "./bin/helics_webserver-tests --gtest_filter=-*nocov*"
-    "./bin/network-tests --gtest_filter=*"
+    "./bin/network-tests --gtest_filter=-*nocov*"
 )
 
 SUMRESULT=0
diff --git a/src/helics/application_api/AsyncFedCallInfo.hpp b/src/helics/application_api/AsyncFedCallInfo.hpp
index bb5adcde3a..d4de4cca29 100644
--- a/src/helics/application_api/AsyncFedCallInfo.hpp
+++ b/src/helics/application_api/AsyncFedCallInfo.hpp
@@ -15,7 +15,7 @@ namespace helics {
 /** helper class for Federate info that holds the futures for asynchronous calls*/
 class AsyncFedCallInfo {
   public:
-    std::future<void> initFuture; /**future for the Enter initialization call*/
+    std::future<bool> initFuture; /**future for the Enter initialization call*/
     std::future<IterationResult> execFuture; /** future for the enter execution mode call*/
     std::future<Time> timeRequestFuture; /** future for the timeRequest call*/
     std::future<iteration_time>
diff --git a/src/helics/application_api/Federate.cpp b/src/helics/application_api/Federate.cpp
index 2d0e93b0cb..e1278a53b1 100644
--- a/src/helics/application_api/Federate.cpp
+++ b/src/helics/application_api/Federate.cpp
@@ -227,8 +227,9 @@ void Federate::enterInitializingMode()
     switch (cm) {
         case Modes::STARTUP:
             try {
-                coreObject->enterInitializingMode(fedID);
-                enteringInitializingMode(IterationResult::NEXT_STEP);
+                if (coreObject->enterInitializingMode(fedID)) {
+                    enteringInitializingMode(IterationResult::NEXT_STEP);
+                }
             }
             catch (const HelicsException&) {
                 updateFederateMode(Modes::ERROR_STATE);
@@ -264,7 +265,7 @@ void Federate::enterInitializingModeAsync()
         auto asyncInfo = asyncCallInfo->lock();
         if (currentMode.compare_exchange_strong(cm, Modes::PENDING_INIT)) {
             asyncInfo->initFuture = std::async(std::launch::async, [this]() {
-                coreObject->enterInitializingMode(fedID);
+                return coreObject->enterInitializingMode(fedID);
             });
         }
     } else if (cm == Modes::PENDING_INIT) {
@@ -303,8 +304,10 @@ void Federate::enterInitializingModeComplete()
         case Modes::PENDING_INIT: {
             auto asyncInfo = asyncCallInfo->lock();
             try {
-                asyncInfo->initFuture.get();
-                enteringInitializingMode(IterationResult::NEXT_STEP);
+                bool res = asyncInfo->initFuture.get();
+                if (res) {
+                    enteringInitializingMode(IterationResult::NEXT_STEP);
+                }
             }
             catch (const std::exception&) {
                 updateFederateMode(Modes::ERROR_STATE);
@@ -461,7 +464,7 @@ IterationResult Federate::enterExecutingModeComplete()
 void Federate::setAsyncCheck(std::function<bool()> asyncCheck)
 {
     auto asyncInfo = asyncCallInfo->lock();
-    asyncInfo->asyncCheck = asyncCheck;
+    asyncInfo->asyncCheck = std::move(asyncCheck);
 }
 
 void Federate::setTag(std::string_view tag, std::string_view value)
diff --git a/src/helics/application_api/FederateInfo.cpp b/src/helics/application_api/FederateInfo.cpp
index 87fce51a9c..d71392d775 100644
--- a/src/helics/application_api/FederateInfo.cpp
+++ b/src/helics/application_api/FederateInfo.cpp
@@ -62,7 +62,7 @@ FederateInfo::FederateInfo(const std::string& args)
     loadInfoFromArgsIgnoreOutput(args);
 }
 
-static constexpr frozen::unordered_map<std::string_view, int, 66> propStringsTranslations{
+static constexpr frozen::unordered_map<std::string_view, int, 67> propStringsTranslations{
     {"period", HELICS_PROPERTY_TIME_PERIOD},
     {"timeperiod", HELICS_PROPERTY_TIME_PERIOD},
     {"time_period", HELICS_PROPERTY_TIME_PERIOD},
diff --git a/src/helics/core/CommonCore.cpp b/src/helics/core/CommonCore.cpp
index 4672803aa2..3c131a6c48 100644
--- a/src/helics/core/CommonCore.cpp
+++ b/src/helics/core/CommonCore.cpp
@@ -573,7 +573,8 @@ static void generateFederateException(const FederateState* fed)
             throw(HelicsException(fed->lastErrorString()));
     }
 }
-void CommonCore::enterInitializingMode(LocalFederateId federateID)
+
+bool CommonCore::enterInitializingMode(LocalFederateId federateID)
 {
     auto* fed = getFederateAt(federateID);
     if (fed == nullptr) {
@@ -583,7 +584,7 @@ void CommonCore::enterInitializingMode(LocalFederateId federateID)
         case FederateStates::CREATED:
             break;
         case FederateStates::INITIALIZING:
-            return;
+            return false;
         default:
             throw(InvalidFunctionCall("May only enter initializing state from created state"));
     }
@@ -595,17 +596,18 @@ void CommonCore::enterInitializingMode(LocalFederateId federateID)
         m.source_id = fed->global_id.load();
         addActionMessage(m);
 
-        if (!fed->isCallbackFederate()) {
-            auto check = fed->enterInitializingMode();
-            if (check != IterationResult::NEXT_STEP) {
-                fed->init_requested = false;
-                if (check == IterationResult::HALTED) {
-                    throw(HelicsSystemFailure());
-                }
-                generateFederateException(fed);
+        if (fed->isCallbackFederate()) {
+            return false;
+        }
+        auto check = fed->enterInitializingMode();
+        if (check != IterationResult::NEXT_STEP) {
+            fed->init_requested = false;
+            if (check == IterationResult::HALTED) {
+                throw(HelicsSystemFailure());
             }
+            generateFederateException(fed);
         }
-        return;
+        return true;
     }
     throw(InvalidFunctionCall("federate already has requested entry to initializing State"));
 }
diff --git a/src/helics/core/CommonCore.hpp b/src/helics/core/CommonCore.hpp
index 8713b0036d..9218d3542c 100644
--- a/src/helics/core/CommonCore.hpp
+++ b/src/helics/core/CommonCore.hpp
@@ -98,7 +98,7 @@ class CommonCore: public Core, public BrokerBase {
     virtual int getErrorCode() const override final;
     virtual std::string getErrorMessage() const override final;
     virtual void finalize(LocalFederateId federateID) override final;
-    virtual void enterInitializingMode(LocalFederateId federateID) override final;
+    virtual bool enterInitializingMode(LocalFederateId federateID) override final;
     virtual void setCoreReadyToInit() override final;
     virtual IterationResult
         enterExecutingMode(LocalFederateId federateID,
diff --git a/src/helics/core/Core.hpp b/src/helics/core/Core.hpp
index 4f7ebc86ae..eeb9cfbb0a 100644
--- a/src/helics/core/Core.hpp
+++ b/src/helics/core/Core.hpp
@@ -157,8 +157,9 @@ class Core {
      *
      * May only be invoked in Created state otherwise an error is thrown
      * for callback federates this call passes full control to the core
+     @return will return true if the call resulted in Initializing mode being reached
      */
-    virtual void enterInitializingMode(LocalFederateId federateID) = 0;
+    virtual bool enterInitializingMode(LocalFederateId federateID) = 0;
 
     /** set the core to ready to enter init
     @details this function only needs to be called for cores that don't have any federates but may
diff --git a/src/helics/core/EmptyCore.cpp b/src/helics/core/EmptyCore.cpp
index 8784613cba..3f49ec7593 100644
--- a/src/helics/core/EmptyCore.cpp
+++ b/src/helics/core/EmptyCore.cpp
@@ -97,7 +97,10 @@ void EmptyCore::finalize(LocalFederateId /*federateID*/) {}
 
 void EmptyCore::setCoreReadyToInit() {}
 
-void EmptyCore::enterInitializingMode(LocalFederateId /*federateID*/) {}
+bool EmptyCore::enterInitializingMode(LocalFederateId /*federateID*/)
+{
+    return false;
+}
 
 IterationResult EmptyCore::enterExecutingMode(LocalFederateId /*federateID*/,
                                               IterationRequest /*iterate*/)
diff --git a/src/helics/core/EmptyCore.hpp b/src/helics/core/EmptyCore.hpp
index 9b69cf9a70..b18015e8fb 100644
--- a/src/helics/core/EmptyCore.hpp
+++ b/src/helics/core/EmptyCore.hpp
@@ -38,7 +38,7 @@ class EmptyCore: public Core {
     virtual int getErrorCode() const override;
     virtual std::string getErrorMessage() const override;
     virtual void finalize(LocalFederateId federateID) override;
-    virtual void enterInitializingMode(LocalFederateId federateID) override;
+    virtual bool enterInitializingMode(LocalFederateId federateID) override;
     virtual void setCoreReadyToInit() override;
     virtual IterationResult enterExecutingMode(LocalFederateId federateID,
                                                IterationRequest iterate = NO_ITERATION) override;
diff --git a/src/helics/network/NetworkCommsInterface.cpp b/src/helics/network/NetworkCommsInterface.cpp
index a8660a50d8..397599f166 100644
--- a/src/helics/network/NetworkCommsInterface.cpp
+++ b/src/helics/network/NetworkCommsInterface.cpp
@@ -125,7 +125,7 @@ void NetworkCommsInterface::loadNetworkInfo(const NetworkBrokerData& netInfo)
                     localTargetAddress = localHostString;
                     break;
                 default:
-                    localTargetAddress = "*";
+                    localTargetAddress.assign(1, '*');
                     break;
             }
         } else {
diff --git a/tests/helics/application_api/CallbackFederateTests.cpp b/tests/helics/application_api/CallbackFederateTests.cpp
index b68d0c990a..781ef07bfe 100644
--- a/tests/helics/application_api/CallbackFederateTests.cpp
+++ b/tests/helics/application_api/CallbackFederateTests.cpp
@@ -83,16 +83,16 @@ TEST_F(callbackFed, timeSteps)
     auto vFed1 = GetFederateAs<helics::CallbackFederate>(0);
     int cb1{0};
     int cb2{0};
-    vFed1->setTimeRequestReturnCallback([&cb1](auto, bool) { ++cb1; });
-    vFed1->setTimeRequestEntryCallback([&cb2](auto, auto, bool) { ++cb2; });
+    vFed1->setTimeRequestReturnCallback([&cb1](auto /*unused*/, bool /*unused*/) { ++cb1; });
+    vFed1->setTimeRequestEntryCallback(
+        [&cb2](auto /*unused*/, auto /*unused*/, bool /*unused*/) { ++cb2; });
 
     vFed1->setNextTimeIterativeCallback([](auto t) {
         if (t.grantedTime >= 3.0) {
             return std::make_pair(helics::Time::maxVal(),
                                   helics::IterationRequest::HALT_OPERATIONS);
-        } else {
-            return std::make_pair(t.grantedTime + 1.0, helics::IterationRequest::NO_ITERATIONS);
         }
+        return std::make_pair(t.grantedTime + 1.0, helics::IterationRequest::NO_ITERATIONS);
     });
     auto v = std::make_shared<std::promise<int>>();
     auto vfut = v->get_future();
@@ -116,8 +116,9 @@ TEST_F(callbackFed, timeStepsPeriodMax)
     int cb2{0};
     vFed1->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 3.0);
     vFed1->setProperty(HELICS_PROPERTY_TIME_PERIOD, 1.0);
-    vFed1->setTimeRequestReturnCallback([&cb1](auto, bool) { ++cb1; });
-    vFed1->setTimeRequestEntryCallback([&cb2](auto, auto, bool) { ++cb2; });
+    vFed1->setTimeRequestReturnCallback([&cb1](auto /*unused*/, bool /*unused*/) { ++cb1; });
+    vFed1->setTimeRequestEntryCallback(
+        [&cb2](auto /*unused*/, auto /*unused*/, bool /*unused*/) { ++cb2; });
 
     auto v = std::make_shared<std::promise<int>>();
     auto vfut = v->get_future();
@@ -181,8 +182,9 @@ TEST_F(callbackFed, timeStepError)
     auto vFed1 = GetFederateAs<helics::CallbackFederate>(0);
     int cb1{0};
     int cb2{0};
-    vFed1->setTimeRequestReturnCallback([&cb1](auto, bool) { ++cb1; });
-    vFed1->setTimeRequestEntryCallback([&cb2](auto, auto, bool) { ++cb2; });
+    vFed1->setTimeRequestReturnCallback([&cb1](auto /*unused*/, bool /*unused*/) { ++cb1; });
+    vFed1->setTimeRequestEntryCallback(
+        [&cb2](auto /*unused*/, auto /*unused*/, bool /*unused*/) { ++cb2; });
 
     vFed1->setNextTimeIterativeCallback([](auto t) {
         if (t.grantedTime >= 3.0) {
@@ -214,8 +216,9 @@ TEST_F(callbackFed, timeStepException)
     auto vFed1 = GetFederateAs<helics::CallbackFederate>(0);
     int cb1{0};
     int cb2{0};
-    vFed1->setTimeRequestReturnCallback([&cb1](auto, bool) { ++cb1; });
-    vFed1->setTimeRequestEntryCallback([&cb2](auto, auto, bool) { ++cb2; });
+    vFed1->setTimeRequestReturnCallback([&cb1](auto /*unused*/, bool /*unused*/) { ++cb1; });
+    vFed1->setTimeRequestEntryCallback(
+        [&cb2](auto /*unused*/, auto /*unused*/, bool /*unused*/) { ++cb2; });
 
     vFed1->setNextTimeIterativeCallback([](auto t) {
         if (t.grantedTime >= 3.0) {
@@ -256,13 +259,14 @@ TEST_F(callbackFed, timeSteps2Fed)
     auto& s2 = vFed2->registerSubscription("pub1");
     s1.setDefault(0.3);
     s2.setDefault(0.4);
-    std::vector<double> v1, v2;
+    std::vector<double> v1;
 
-    vFed1->setTimeRequestReturnCallback([&](auto time, bool) {
+    vFed1->setTimeRequestReturnCallback([&](auto time, bool /*unused*/) {
         p1.publish(18.7 + static_cast<double>(time));
         v1.push_back(s1.getValue<double>());
     });
-    vFed2->setTimeRequestReturnCallback([&](auto time, bool) {
+    std::vector<double> v2;
+    vFed2->setTimeRequestReturnCallback([&](auto time, bool /*unused*/) {
         p2.publish(23.7 + static_cast<double>(time));
         v2.push_back(s2.getValue<double>());
     });
@@ -297,7 +301,7 @@ TEST_F(callbackFed, timeSteps2Fed)
     EXPECT_DOUBLE_EQ(v2[3], 20.7);
 }
 
-TEST_F(callbackFed, 100Fed)
+TEST_F(callbackFed, 100Fed_nosan)
 {
     const int fedCount{100};
     SetupTest<helics::CallbackFederate>("test", fedCount);
@@ -311,19 +315,22 @@ TEST_F(callbackFed, 100Fed)
                                              std::to_string((ii < 99) ? ii + 1 : 0) + "/p1");
         s1.setDefault(0.7);
 
-        fed->setTimeRequestReturnCallback([fed, ii, &vals](auto time, bool) {
+        fed->setTimeRequestReturnCallback([fed, ii, &vals](auto time, bool /*unused*/) {
             fed->getPublication(0).publish(static_cast<double>(ii) + static_cast<double>(time));
             vals[ii] = fed->getInput(0).getValue<double>();
         });
         fed->enterInitializingMode();
     }
+
     brokers.front()->waitForDisconnect();
+    GetFederateAs<helics::Federate>(1)->getCorePointer()->waitForDisconnect();
     EXPECT_TRUE(GetFederateAs<helics::CallbackFederate>(1)->isAsyncOperationCompleted());
 
     EXPECT_DOUBLE_EQ(vals[27], 120.0 + 27.0);
+    FullDisconnect();
 }
 
-TEST_F(callbackFed, 1000Fed_ci_skip)
+TEST_F(callbackFed, 1000Fed_ci_skip_nosan)
 {
     constexpr int fedCount{1000};
     SetupTest<helics::CallbackFederate>("test", fedCount);
@@ -337,7 +344,7 @@ TEST_F(callbackFed, 1000Fed_ci_skip)
             std::string("fed") + std::to_string((ii < (fedCount - 1)) ? ii + 1 : 0) + "/p1");
         s1.setDefault(0.7);
 
-        fed->setTimeRequestReturnCallback([fed, ii, &vals](auto time, bool) {
+        fed->setTimeRequestReturnCallback([fed, ii, &vals](auto time, bool /*unused*/) {
             fed->getPublication(0).publish(static_cast<double>(ii) + static_cast<double>(time));
             vals[ii] = fed->getInput(0).getValue<double>();
         });
@@ -363,10 +370,10 @@ TEST_F(callbackFed, timeSteps2FedIterruption)
     auto& s2 = vFed2->registerSubscription("pub1");
     s1.setDefault(0.3);
     s2.setDefault(0.4);
-    std::vector<double> v1, v2;
-    std::vector<helics::Time> t1, t2;
+    std::vector<double> v1;
+    std::vector<helics::Time> t1;
 
-    vFed1->setTimeRequestReturnCallback([&](auto time, bool) {
+    vFed1->setTimeRequestReturnCallback([&](auto time, bool /*unused*/) {
         static bool trigger = false;
         if (trigger) {
             p1.publish(22.1 + static_cast<double>(time));
@@ -376,7 +383,10 @@ TEST_F(callbackFed, timeSteps2FedIterruption)
         t1.push_back(time);
         trigger = !trigger;
     });
-    vFed2->setTimeRequestReturnCallback([&](auto time, bool) {
+
+    std::vector<double> v2;
+    std::vector<helics::Time> t2;
+    vFed2->setTimeRequestReturnCallback([&](auto time, bool /*unused*/) {
         static bool trigger = false;
         if (trigger) {
             p2.publish(98.7 + static_cast<double>(time));
diff --git a/tests/helics/application_api/FederateTests.cpp b/tests/helics/application_api/FederateTests.cpp
index 82c372cd7d..a13347d8ab 100644
--- a/tests/helics/application_api/FederateTests.cpp
+++ b/tests/helics/application_api/FederateTests.cpp
@@ -230,7 +230,7 @@ TEST(federate_tests, timeout_error_zmq_ci_skip_nosan)
                  helics::RegistrationFailure);
 }
 
-TEST(federate_tests, timeout_abort_zmq_ci_skip_nosan)
+TEST(federate_tests, timeout_abort_zmq_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
@@ -259,7 +259,7 @@ TEST(federate_tests, timeout_abort_zmq_ci_skip_nosan)
 #endif
 
 #ifdef HELICS_ENABLE_TCP_CORE
-TEST(federate_tests, timeout_abort_tcp_ci_skip_nosan)
+TEST(federate_tests, timeout_abort_tcp_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
@@ -285,7 +285,7 @@ TEST(federate_tests, timeout_abort_tcp_ci_skip_nosan)
     }
 }
 
-TEST(federate_tests, timeout_abort_tcpss_ci_skip_nosan)
+TEST(federate_tests, timeout_abort_tcpss_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
@@ -313,7 +313,7 @@ TEST(federate_tests, timeout_abort_tcpss_ci_skip_nosan)
 #endif
 
 #ifdef HELICS_ENABLE_UDP_CORE
-TEST(federate_tests, timeout_abort_udp_ci_skip_nosan)
+TEST(federate_tests, timeout_abort_udp_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
diff --git a/tests/helics/core/BrokerClassTests.cpp b/tests/helics/core/BrokerClassTests.cpp
index 2165f44c0b..c61e418ee5 100644
--- a/tests/helics/core/BrokerClassTests.cpp
+++ b/tests/helics/core/BrokerClassTests.cpp
@@ -111,7 +111,7 @@ TEST(brokers, broker_log_command_failures)
 }
 
 #ifdef HELICS_ENABLE_ZMQ_CORE
-TEST(brokers, force_override_ci_skip)
+TEST(brokers, force_override_ci_skip_nocov)
 {
     auto brk = helics::BrokerFactory::create(helics::CoreType::ZMQ, "gbroker_f1", "");
     EXPECT_TRUE(brk->isConnected());

From 06e4af5cdf1de8a44e15f4b8d9233b14183eece9 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Wed, 21 Sep 2022 05:54:06 -0700
Subject: [PATCH 02/16] Add a disable operation for terminate commands (#2440)

* Add a disable operation for terminate commands, so federates/core/brokers cannot be remote controlled.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 src/helics/application_api/FederateInfo.cpp   |  15 ++-
 src/helics/core/BrokerBase.cpp                |  16 ++-
 src/helics/core/BrokerBase.hpp                |   1 +
 src/helics/core/CommonCore.cpp                |   6 ++
 src/helics/core/FederateState.cpp             |  40 +++++--
 src/helics/core/FederateState.hpp             |   4 +-
 src/helics/core/helics_definitions.hpp        |   8 +-
 src/helics/helics_enums.h                     |   8 +-
 .../system_tests/commandInterfaceTests.cpp    | 101 ++++++++++++++++++
 9 files changed, 180 insertions(+), 19 deletions(-)

diff --git a/src/helics/application_api/FederateInfo.cpp b/src/helics/application_api/FederateInfo.cpp
index d71392d775..a6e2dd0a25 100644
--- a/src/helics/application_api/FederateInfo.cpp
+++ b/src/helics/application_api/FederateInfo.cpp
@@ -131,7 +131,7 @@ static constexpr frozen::unordered_map<std::string_view, int, 67> propStringsTra
     {"logBuffer", HELICS_PROPERTY_INT_LOG_BUFFER},
     {"log_buffer", HELICS_PROPERTY_INT_LOG_BUFFER}};
 
-static constexpr frozen::unordered_map<std::string_view, int, 83> flagStringsTranslations{
+static constexpr frozen::unordered_map<std::string_view, int, 89> flagStringsTranslations{
     {"source_only", HELICS_FLAG_SOURCE_ONLY},
     {"sourceonly", HELICS_FLAG_SOURCE_ONLY},
     {"sourceOnly", HELICS_FLAG_SOURCE_ONLY},
@@ -215,7 +215,13 @@ static constexpr frozen::unordered_map<std::string_view, int, 83> flagStringsTra
     {"rollback", HELICS_FLAG_ROLLBACK},
     {"terminate_on_error", HELICS_FLAG_TERMINATE_ON_ERROR},
     {"terminateOnError", HELICS_FLAG_TERMINATE_ON_ERROR},
-    {"terminateonerror", HELICS_FLAG_TERMINATE_ON_ERROR}};
+    {"terminateonerror", HELICS_FLAG_TERMINATE_ON_ERROR},
+    {"allowRemoteControl", HELICS_FLAG_ALLOW_REMOTE_CONTROL},
+    {"allowremotecontrol", HELICS_FLAG_ALLOW_REMOTE_CONTROL},
+    {"allow_remote_control", HELICS_FLAG_ALLOW_REMOTE_CONTROL},
+    {"disableRemoteControl", HELICS_FLAG_DISABLE_REMOTE_CONTROL},
+    {"disableremotecontrol", HELICS_FLAG_DISABLE_REMOTE_CONTROL},
+    {"disable_remote_control", HELICS_FLAG_DISABLE_REMOTE_CONTROL}};
 
 static constexpr frozen::unordered_map<std::string_view, int, 41> optionStringsTranslations{
     {"buffer_data", HELICS_HANDLE_OPTION_BUFFER_DATA},
@@ -542,6 +548,11 @@ std::unique_ptr<helicsCLI11App> FederateInfo::makeCLIApp()
     app->add_flag("--observer",
                   observer,
                   "tell the federate/core that this federate is an observer");
+    // this is added here to match the command arguments for a broker, also works as a flag
+    app->add_flag_function(
+        "--allow_remote_control,!--disable_remote_control",
+        [this](int64_t val) { setFlagOption(HELICS_FLAG_ALLOW_REMOTE_CONTROL, (val > 0)); },
+        "enable the federate to respond to certain remote operations such as disconnect");
     app->add_flag(
         "--json",
         useJsonSerialization,
diff --git a/src/helics/core/BrokerBase.cpp b/src/helics/core/BrokerBase.cpp
index 557dfb7799..fe203dfd25 100644
--- a/src/helics/core/BrokerBase.cpp
+++ b/src/helics/core/BrokerBase.cpp
@@ -147,6 +147,10 @@ std::shared_ptr<helicsCLI11App> BrokerBase::generateBaseCLI()
         "--debugging",
         debugging,
         "specify that a broker/core should operate in user debugging mode equivalent to --slow_responding --disable_timer");
+    hApp->add_flag(
+        "--allow_remote_control,!--disable_remote_control",
+        allowRemoteControl,
+        "enable the broker to respond to certain remote commands that affect operations, such as disconnect");
     hApp->add_flag(
         "--globaltime",
         globalTime,
@@ -454,11 +458,13 @@ std::pair<bool, std::vector<std::string_view>>
     }
     if (res[0] == "ignore") {
     } else if (res[0] == "terminate") {
-        LOG_SUMMARY(global_broker_id_local,
-                    identifier,
-                    " received terminate instruction via command instruction")
-        ActionMessage udisconnect(CMD_USER_DISCONNECT);
-        addActionMessage(udisconnect);
+        if (allowRemoteControl) {
+            LOG_SUMMARY(global_broker_id_local,
+                        identifier,
+                        " received terminate instruction via command instruction")
+            ActionMessage udisconnect(CMD_USER_DISCONNECT);
+            addActionMessage(udisconnect);
+        }
     } else if (res[0] == "echo") {
         LOG_SUMMARY(global_broker_id_local,
                     identifier,
diff --git a/src/helics/core/BrokerBase.hpp b/src/helics/core/BrokerBase.hpp
index 8652a3aa0d..a084e35a1f 100644
--- a/src/helics/core/BrokerBase.hpp
+++ b/src/helics/core/BrokerBase.hpp
@@ -144,6 +144,7 @@ class BrokerBase {
     /** specify that outgoing connection should use json serialization */
     bool useJsonSerialization{false};
     bool enable_profiling{false};  //!< indicator that profiling is enabled
+    bool allowRemoteControl{true};  //!< if true allows some remote operation
     /// time when the error condition started; related to the errorDelay
     decltype(std::chrono::steady_clock::now()) errorTimeStart;
     /// time when the disconnect started
diff --git a/src/helics/core/CommonCore.cpp b/src/helics/core/CommonCore.cpp
index 3c131a6c48..aeceb192ea 100644
--- a/src/helics/core/CommonCore.cpp
+++ b/src/helics/core/CommonCore.cpp
@@ -4730,6 +4730,12 @@ void CommonCore::processCoreConfigureCommands(ActionMessage& cmd)
         }
 
         break;
+        case defs::Flags::ALLOW_REMOTE_CONTROL:
+            allowRemoteControl = checkActionFlag(cmd, indicator_flag);
+            break;
+        case defs::Flags::DISABLE_REMOTE_CONTROL:
+            allowRemoteControl = !checkActionFlag(cmd, indicator_flag);
+            break;
         case defs::Flags::TERMINATE_ON_ERROR:
             terminate_on_error = checkActionFlag(cmd, indicator_flag);
             break;
diff --git a/src/helics/core/FederateState.cpp b/src/helics/core/FederateState.cpp
index 874a4b009f..6eaadcf359 100644
--- a/src/helics/core/FederateState.cpp
+++ b/src/helics/core/FederateState.cpp
@@ -197,7 +197,7 @@ void FederateState::generateConfig(Json::Value& base) const
     base["observer"] = observer;
     base["source_only"] = mSourceOnly;
     base["strict_input_type_checking"] = strict_input_type_checking;
-    base["slow_responding"] = slow_responding;
+    base["slow_responding"] = mSlowResponding;
     if (rt_lag > timeZero) {
         base["rt_lag"] = static_cast<double>(rt_lag);
     }
@@ -1984,7 +1984,7 @@ void FederateState::setOptionFlag(int optionFlag, bool value)
             break;
         case defs::Flags::SLOW_RESPONDING:
         case defs::Flags::DEBUGGING:
-            slow_responding = value;
+            mSlowResponding = value;
             break;
         case defs::Flags::PROFILING:
             if (value && !mProfilerActive) {
@@ -1992,6 +1992,12 @@ void FederateState::setOptionFlag(int optionFlag, bool value)
             }
             mProfilerActive = value;
             break;
+        case defs::Flags::ALLOW_REMOTE_CONTROL:
+            mAllowRemoteControl = value;
+            break;
+        case defs::Flags::DISABLE_REMOTE_CONTROL:
+            mAllowRemoteControl = !value;
+            break;
         case defs::Flags::PROFILING_MARKER:
             if (value && mProfilerActive) {
                 generateProfilingMarker();
@@ -2101,7 +2107,7 @@ bool FederateState::getOptionFlag(int optionFlag) const
             return mSourceOnly;
         case defs::Flags::SLOW_RESPONDING:
         case defs::Flags::DEBUGGING:
-            return slow_responding;
+            return mSlowResponding;
         case defs::Flags::TERMINATE_ON_ERROR:
             return terminate_on_error;
         case defs::Flags::CONNECTIONS_REQUIRED:
@@ -2116,6 +2122,8 @@ bool FederateState::getOptionFlag(int optionFlag) const
             return ignore_time_mismatch_warnings;
         case defs::Properties::LOG_BUFFER:
             return (mLogManager->getLogBuffer().capacity() > 0);
+            // NOTE: the allow remote control property is purposely not retrievable and should not
+            // be in config generation
         default:
             return timeCoord->getOptionFlag(optionFlag);
     }
@@ -2320,12 +2328,26 @@ void FederateState::sendCommand(ActionMessage& command)
         return;
     }
 
-    if (res[0] == "terminate") {
-        if (mParent != nullptr) {
-            ActionMessage bye(CMD_DISCONNECT);
-            bye.source_id = global_id.load();
-            bye.dest_id = bye.source_id;
-            mParent->addActionMessage(bye);
+    if (res[0] == "terminate" || res[0] == "halt") {
+        if (mAllowRemoteControl) {
+            if (mParent != nullptr) {
+                ActionMessage bye(CMD_DISCONNECT);
+                bye.source_id = global_id.load();
+                bye.dest_id = bye.source_id;
+                mParent->addActionMessage(bye);
+            }
+        } else {
+            if (mParent != nullptr) {
+                ActionMessage response(command.action());
+                response.payload =
+                    fmt::format("log {} does not allow remote termination", getIdentifier());
+                response.dest_id = command.source_id;
+                response.source_id = global_id.load();
+                response.setString(targetStringLoc, command.getString(sourceStringLoc));
+                response.setString(sourceStringLoc, getIdentifier());
+
+                mParent->addActionMessage(std::move(response));
+            }
         }
     } else if (res[0] == "echo") {
         if (mParent != nullptr) {
diff --git a/src/helics/core/FederateState.hpp b/src/helics/core/FederateState.hpp
index 6d62e65324..71d485649b 100644
--- a/src/helics/core/FederateState.hpp
+++ b/src/helics/core/FederateState.hpp
@@ -77,7 +77,9 @@ class FederateState {
     bool strict_input_type_checking{false};
     bool ignore_unit_mismatch{false};  //!< flag to ignore mismatching units
     /// flag indicating that a federate is likely to be slow in responding
-    bool slow_responding{false};
+    bool mSlowResponding{false};
+    /// @brief flag indicating that the federate is open to remote control
+    bool mAllowRemoteControl{true};
     InterfaceInfo interfaceInformation;  //!< the container for the interface information objects
     std::unique_ptr<LogManager> mLogManager;
     int maxLogLevel{HELICS_LOG_LEVEL_NO_PRINT};
diff --git a/src/helics/core/helics_definitions.hpp b/src/helics/core/helics_definitions.hpp
index 97571409b7..6cb3f5e46f 100644
--- a/src/helics/core/helics_definitions.hpp
+++ b/src/helics/core/helics_definitions.hpp
@@ -88,7 +88,13 @@ namespace defs {
         /** flag indicating that profiling should captured to federate log file*/
         LOCAL_PROFILING_CAPTURE = HELICS_FLAG_LOCAL_PROFILING_CAPTURE,
         /** flag indicating the federate is a callback federate */
-        CALLBACK_FEDERATE = HELICS_FLAG_CALLBACK_FEDERATE
+        CALLBACK_FEDERATE = HELICS_FLAG_CALLBACK_FEDERATE,
+        /** flag indicating that the federate/core/broker should allow remote commands affecting
+           operations*/
+        ALLOW_REMOTE_CONTROL = HELICS_FLAG_ALLOW_REMOTE_CONTROL,
+        /** flag indicating that the federate/core/broker should *NOT* allow remote commands
+           affecting operations*/
+        DISABLE_REMOTE_CONTROL = HELICS_FLAG_DISABLE_REMOTE_CONTROL,
     };
     /** potential errors that might be generated by a helics federate/core/broker */
     enum Errors : int32_t {
diff --git a/src/helics/helics_enums.h b/src/helics/helics_enums.h
index 01cf43e2e0..a11594f1c8 100644
--- a/src/helics/helics_enums.h
+++ b/src/helics/helics_enums.h
@@ -180,7 +180,13 @@ typedef enum { /* NOLINT */
                /** specify that helics should capture profiling data*/
                HELICS_FLAG_PROFILING = 93,
                /** flag trigger for generating a profiling marker*/
-               HELICS_FLAG_PROFILING_MARKER = 95
+               HELICS_FLAG_PROFILING_MARKER = 95,
+               /** specify that the federate/core/broker should allow some remote control operations
+                  such as finalize*/
+               HELICS_FLAG_ALLOW_REMOTE_CONTROL = 109,
+               /** specify that the federate/core/broker should *NOT* allow some remote control
+                  operations such as finalize*/
+               HELICS_FLAG_DISABLE_REMOTE_CONTROL = 110
 } HelicsFlags;
 
 /** log level definitions
diff --git a/tests/helics/system_tests/commandInterfaceTests.cpp b/tests/helics/system_tests/commandInterfaceTests.cpp
index 0f92e11700..af81023327 100644
--- a/tests/helics/system_tests/commandInterfaceTests.cpp
+++ b/tests/helics/system_tests/commandInterfaceTests.cpp
@@ -274,6 +274,107 @@ TEST_F(command_tests, federation_finalize_core_command)
     vFed2->finalize();
 }
 
+TEST_F(command_tests, federate_finalize_command)
+{
+    SetupTest<helics::ValueFederate>("test_2", 2);
+    auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
+    auto vFed2 = GetFederateAs<helics::ValueFederate>(1);
+    // register the publications
+    vFed1->registerGlobalPublication<double>("pub1");
+
+    vFed2->registerSubscription("pub1");
+    vFed2->registerGlobalPublication<double>("pub2");
+
+    vFed1->registerSubscription("pub2");
+
+    vFed1->enterExecutingModeAsync();
+    vFed2->enterExecutingMode();
+    vFed1->enterExecutingModeComplete();
+    vFed2->sendCommand(vFed1->getName(), "terminate");
+    vFed1->sendCommand(vFed2->getName(), "terminate");
+
+    auto tres = vFed1->requestNextStep();
+    EXPECT_GE(tres, cHelicsBigNumber);
+    tres = vFed2->requestNextStep();
+    EXPECT_GE(tres, cHelicsBigNumber);
+    vFed1->finalize();
+    vFed2->finalize();
+}
+
+TEST_F(command_tests, federate_finalize_command_disable)
+{
+    SetupTest<helics::ValueFederate>("test_2", 2);
+    auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
+    auto vFed2 = GetFederateAs<helics::ValueFederate>(1);
+    // register the publications
+    vFed1->registerGlobalPublication<double>("pub1");
+
+    vFed2->registerSubscription("pub1");
+    vFed2->registerGlobalPublication<double>("pub2");
+
+    vFed1->registerSubscription("pub2");
+    vFed1->setFlagOption(HELICS_FLAG_ALLOW_REMOTE_CONTROL, false);
+    vFed2->setFlagOption(HELICS_FLAG_DISABLE_REMOTE_CONTROL, true);
+    vFed1->enterExecutingModeAsync();
+    vFed2->enterExecutingMode();
+    vFed1->enterExecutingModeComplete();
+    vFed2->sendCommand(vFed1->getName(), "terminate");
+    vFed1->sendCommand(vFed2->getName(), "terminate");
+
+    vFed1->requestTimeAsync(0);
+    auto tres = vFed2->requestNextStep();
+    EXPECT_LT(tres, 1.0);
+    tres = vFed1->requestTimeComplete();
+    EXPECT_LT(tres, 1.0);
+    vFed1->finalize();
+    vFed2->finalize();
+}
+
+TEST_F(command_tests, federation_finalize_command_disable)
+{
+    extraBrokerArgs = "--disable_remote_control";
+
+    SetupTest<helics::ValueFederate>("test_2", 2);
+    auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
+    auto vFed2 = GetFederateAs<helics::ValueFederate>(1);
+    // register the publications
+    vFed1->registerGlobalPublication<double>("pub1");
+
+    vFed2->registerSubscription("pub1");
+    helics::CoreApp cr(vFed1->getCorePointer());
+
+    vFed1->enterExecutingModeAsync();
+    vFed2->enterExecutingMode();
+    vFed1->enterExecutingModeComplete();
+    vFed1->sendCommand("federation", "terminate");
+
+    EXPECT_FALSE(cr.waitForDisconnect(std::chrono::milliseconds(600)));
+    vFed1->finalize();
+    vFed2->finalize();
+}
+
+TEST_F(command_tests, federation_finalize_core_command_disable)
+{
+    extraCoreArgs = "--disable_remote_control";
+    SetupTest<helics::ValueFederate>("test_2", 2);
+    auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
+    auto vFed2 = GetFederateAs<helics::ValueFederate>(1);
+    // register the publications
+    vFed1->registerGlobalPublication<double>("pub1");
+
+    vFed2->registerSubscription("pub1");
+    helics::CoreApp cr(vFed1->getCorePointer());
+
+    vFed1->enterExecutingModeAsync();
+    vFed2->enterExecutingMode();
+    vFed1->enterExecutingModeComplete();
+    vFed2->sendCommand(cr.getIdentifier(), "terminate");
+
+    EXPECT_FALSE(cr.waitForDisconnect(std::chrono::milliseconds(600)));
+    vFed1->finalize();
+    vFed2->finalize();
+}
+
 TEST_F(command_tests, core_echo_command)
 {
     SetupTest<helics::ValueFederate>("test_2", 2);

From a1f07c8080b80f995d2add9a2b510e1eca1f2eb8 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Wed, 21 Sep 2022 12:42:47 -0700
Subject: [PATCH 03/16] Profiler append (#2441)

* update documentation

* make the `--profiler` and `--profiler_append` option mutually exclusive to prevent confusion

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>
---
 .../configuration_options_reference.md        | 13 ++--
 docs/user-guide/advanced_topics/profiling.md  |  8 ++-
 src/helics/application_api/FederateInfo.cpp   |  5 +-
 src/helics/core/BrokerBase.cpp                | 45 ++++++++++----
 src/helics/core/ProfilerBuffer.cpp            | 20 ++++++
 src/helics/core/ProfilerBuffer.hpp            |  8 ++-
 tests/helics/system_tests/profilingTests.cpp  | 62 +++++++++++++++++++
 7 files changed, 136 insertions(+), 25 deletions(-)

diff --git a/docs/references/configuration_options_reference.md b/docs/references/configuration_options_reference.md
index 40ca1e863f..613a3ecc4a 100644
--- a/docs/references/configuration_options_reference.md
+++ b/docs/references/configuration_options_reference.md
@@ -256,9 +256,10 @@ A command-line-like string that specifies options for the core as it connects to
 - `--broker_rank=`: For MPI cores only; identifies the MPI rank of the broker
 - `--broker_tag=`: For MPI cores only; identifies the MPI tag of the broker
 - `--localport=`: Port number to use when communicating with this core
-- `--autobroker`: When included the core will automatically generate a broker
+- `--autobroker`: When included the core will automatically generate a broker (does not work for all core types)
 - `--key=`: Specifies a key to use when communicating with the broker. Only federates with this key specified will be able to talk to the broker with the same `key` value. This is used to prevent federations running on the same hardware from accidentally interfering with each other.
-- `--profiler=log` - Send the profiling messages to the default logging file. `log` can be replaced with a path to an alternative file where only the profiling messages will be sent. See the [User Guide page on profiling](../user-guide/advanced_topics/profiling.md) for further details.
+- `--profiler=log` - Send the profiling messages to the default logging file. `log` can be replaced with a path to an alternative file where only the profiling messages will be sent. See the [User Guide page on profiling](../user-guide/advanced_topics/profiling.md) for further details. If a file is specified it is cleared.
+- `--profiler_append=somefile.txt` - Send the profiling messages to file and leave the existing contents appending new data. See the [User Guide page on profiling](../user-guide/advanced_topics/profiling.md) for further details.
 
 In addition to these options, all options shown in the `broker_init_string` are also valid.
 
@@ -268,7 +269,7 @@ In addition to these options, all options shown in the `broker_init_string` are
 
 _API:_ (none)
 
-Automatically generate a broker if one cannot be connected to. For federations with only one broker (often the case) and/or with federations containing custom federates that were developed for this particular application, it can be convenient to create the broker in the process of creating a specific federate; this option allows that to take place. The downside to this is it creates a federation with a small amount of mystery as the broker is not clearly shown to be launched as its own federate alongside the other federates and those unfamiliar with the federation composition may have to spend some extra time to understand where the broker is coming from.
+Automatically generate a broker if one cannot be connected to. For federations with only one broker (often the case) and/or with federations containing custom federates that were developed for this particular application, it can be convenient to create the broker in the process of creating a specific federate; this option allows that to take place. The downside to this is it creates a federation with a small amount of mystery as the broker is not clearly shown to be launched as its own federate alongside the other federates and those unfamiliar with the federation composition may have to spend some extra time to understand where the broker is coming from. This option does not work for all core types, it is specifically designed for inproc and testing cores. Others may be added later.
 
 ---
 
@@ -310,8 +311,8 @@ String used to define the configuration of the broker if one is autogenerated. S
 - `--children=` - The minimum number of child objects the broker should expect before allowing entry to the initializing state.
 - `--subbrokers=` - The minimum number of child objects the broker should expect before allowing entry to the initializing state. Same as `--children` but might be clearer in some cases with multilevel hierarchies.
 - `--brokerkey=` - A broker key to use for connections to ensure federates are connecting with a specific broker and only appropriate federates connect with the broker. See [simultaneous co-simulations](../user-guide/advanced_topics/simultaneous_cosimulations.md) for more information.
-- `--profiler=log` - Send the profiling messages to the default logging file. `log` can be replaced with a path to an alternative file where only the profiling messages will be sent. See the [User Guide page on profiling](../user-guide/advanced_topics/profiling.md) for further details.
-- `--profiler=log` - Send the profiling messages to the default logging file. `log` can be replaced with a path to an alternative file where only the profiling messages will be sent. See the [User Guide page on profiling](../user-guide/advanced_topics/profiling.md) for further details.
+- `--profiler=log` - Send the profiling messages to the default logging file. `log` can be replaced with a path to an alternative file where only the profiling messages will be sent. See the [User Guide page on profiling](../user-guide/advanced_topics/profiling.md) for further details. If a file is specified it is cleared.
+- `--profiler_append=somefile.txt` - Send the profiling messages to file and leave the existing contents appending new data. See the [User Guide page on profiling](../user-guide/advanced_topics/profiling.md) for further details.
 - `--timemonitor=` - Specify the name of the federate to monitor the time from and generate periodic log messages in the broker as the federate updates its time.
 - `--timemonitorperiod=` - can only be used with `--timemonitor`, set the minimum time period which must elapse in simulation before another log message from the time monitor is generated
 - `--logbuffer` - Enable buffering recent log messages for retrieval with the "logs" query. Optionally specify the size of the circular log buffer; defaults to 10 messages if no size is supplied.
@@ -382,8 +383,10 @@ _Property's enumerated name:_ `HELICS_PROPERTY_INT_LOG_LEVEL` [271]
 
 _Valid values:_
 
+- `none` - `HELICS_LOG_LEVEL_NO_PRINT`
 - `no_print` - `HELICS_LOG_LEVEL_NO_PRINT`
 - `error` - `HELICS_LOG_LEVEL_ERROR`
+- `profiling` - `HELICS_LOG_LEVEL_PROFILING`
 - `warning` - `HELICS_LOG_LEVEL_WARNING`
 - `summary` - `HELICS_LOG_LEVEL_SUMMARY`
 - `connections` - `HELICS_LOG_LEVEL_CONNECTIONS`
diff --git a/docs/user-guide/advanced_topics/profiling.md b/docs/user-guide/advanced_topics/profiling.md
index e9c0055975..da02495aec 100644
--- a/docs/user-guide/advanced_topics/profiling.md
+++ b/docs/user-guide/advanced_topics/profiling.md
@@ -37,7 +37,8 @@ Profiling can be enabled at any level of the hierarchy in HELICS and when enable
 
 Profiling is enabled via the command prompt by passing the `--profiler` option when calling `helics_broker`.
 
-- `--profiler=save_profile2.txt` will save profiling data to a text file `save_profile2.txt`
+- `--profiler=save_profile2.txt` will clear save_profile2.txt and save new profiling data to a text file `save_profile2.txt`
+- `--profiler_append=save_profile2.txt` will append profiling data to the text file `save_profile2.txt`
 - `--profiler=log` will capture the profile text output to the normal log file or callback
 - `--profiler` is the same as `--profiler=log`
 
@@ -47,7 +48,8 @@ Enabling this flag will pass in the appropriate flags to all children brokers an
 
 Profiling is enabled via the `coreinitstring` by adding a `--profiler` option.
 
-- `--profiler=save_profile2.txt` will save profiling data to a text file `save_profile2.txt`
+- `--profiler=save_profile2.txt` will clear save_profile2.txt and save new profiling data to a text file `save_profile2.txt`
+- `--profiler_append=save_profile2.txt` will append profiling data to the text file `save_profile2.txt`
 - `--profiler=log` will capture the profile text output to the normal log file or callback
 - `--profiler` is the same as `--profiler=log`
 
@@ -82,4 +84,4 @@ Some can be set through the flags option for federate configuration.
 
 This capability is preliminary and subject to change based on initial feedback. In HELICS 3 there will probably be some additional command infrastructure to handle profiling as well added in the future.
 
-If timing is done in the federate itself as well there will be a time gap; there is some processing code between the profiling message, and when the actual function call returns, but it is not blocking and should be fairly short, though dependent on how much data is actually transferred in the federate.
+If timing is done in the federate itself as well there will be a time gap; there is some processing code between the profiling message, and when the actual function call returns, but it is not blocking and should be fairly short, though dependent on how much data is actually transferred in the federate. Profiling does not work with callback federates.
diff --git a/src/helics/application_api/FederateInfo.cpp b/src/helics/application_api/FederateInfo.cpp
index a6e2dd0a25..239248ced5 100644
--- a/src/helics/application_api/FederateInfo.cpp
+++ b/src/helics/application_api/FederateInfo.cpp
@@ -310,7 +310,7 @@ static const std::unordered_map<std::string, int> log_level_map{
     {"interfaces", HELICS_LOG_LEVEL_INTERFACES},
     /** interfaces + timing message*/
     {"timing", HELICS_LOG_LEVEL_TIMING},
-    {"profiling", HELICS_LOG_LEVEL_WARNING - 1},
+    {"profiling", HELICS_LOG_LEVEL_PROFILING},
     /** timing+ data transfer notices*/
     {"data", HELICS_LOG_LEVEL_DATA},
     /** same as data for now*/
@@ -560,7 +560,7 @@ std::unique_ptr<helicsCLI11App> FederateInfo::makeCLIApp()
     app->add_option(
            "--profiler",
            profilerFileName,
-           "Enable profiling and specify a file name, \"log\" for sending profiling messages to the logger, otherwise specify the output file name")
+           "Enable profiling and specify a file name (NOTE: use --profiler_append=<filename> in the core init string to append to an existing file)")
         ->expected(0, 1)
         ->default_str("log");
     app->add_option("--broker_key,--brokerkey,--brokerKey",
@@ -581,7 +581,6 @@ std::unique_ptr<helicsCLI11App> FederateInfo::makeCLIApp()
            [this](Time val) { setProperty(HELICS_PROPERTY_TIME_DELTA, val); },
            "The minimum time between time grants for a Federate (default in ms)")
         ->configurable(false);
-
     auto* encrypt_group = app->add_option_group("encryption", "options related to encryption");
     encrypt_group->add_flag("--encrypted", encrypted, "enable encryption on the network");
     encrypt_group->add_option("--encryption_config",
diff --git a/src/helics/core/BrokerBase.cpp b/src/helics/core/BrokerBase.cpp
index fe203dfd25..48810cd4b9 100644
--- a/src/helics/core/BrokerBase.cpp
+++ b/src/helics/core/BrokerBase.cpp
@@ -181,29 +181,48 @@ std::shared_ptr<helicsCLI11App> BrokerBase::generateBaseCLI()
                    "use the JSON serialization mode for communications");
 
     // add the profiling setup command
+    auto* popt =
+        hApp->add_option_function<std::string>(
+                "--profiler",
+                [this](const std::string& fileName) {
+                    if (!fileName.empty()) {
+                        if (fileName == "log" || fileName == "true") {
+                            if (prBuff) {
+                                prBuff.reset();
+                            }
+                        } else {
+                            if (!prBuff) {
+                                prBuff = std::make_shared<ProfilerBuffer>();
+                            }
+                            prBuff->setOutputFile(fileName, false);
+                        }
+
+                        enable_profiling = true;
+                    } else {
+                        enable_profiling = false;
+                    }
+                },
+                "activate profiling and set the profiler data output file, set to empty string to disable profiling, set to \"log\" to route profile message to the logging system.")
+            ->expected(0, 1)
+            ->default_str("log");
+
+    // add the profiling append file option
     hApp->add_option_function<std::string>(
-            "--profiler",
+            "--profiler_append",
             [this](const std::string& fileName) {
                 if (!fileName.empty()) {
-                    if (fileName == "log" || fileName == "true") {
-                        if (prBuff) {
-                            prBuff.reset();
-                        }
-                    } else {
-                        if (!prBuff) {
-                            prBuff = std::make_shared<ProfilerBuffer>();
-                        }
-                        prBuff->setOutputFile(fileName);
+                    if (!prBuff) {
+                        prBuff = std::make_shared<ProfilerBuffer>();
                     }
+                    prBuff->setOutputFile(fileName, true);
 
                     enable_profiling = true;
                 } else {
                     enable_profiling = false;
                 }
             },
-            "activate profiling and set the profiler data output file, set to empty string to disable profiling, set to \"log\" to route profile message to the logging system")
-        ->expected(0, 1)
-        ->default_str("log");
+            "activate profiling and set the profiler data output file; new profiler output will be appended to the file")
+        ->excludes(popt);
 
     hApp->add_flag("--terminate_on_error",
                    terminate_on_error,
diff --git a/src/helics/core/ProfilerBuffer.cpp b/src/helics/core/ProfilerBuffer.cpp
index 573f8e873f..828e187dbc 100644
--- a/src/helics/core/ProfilerBuffer.cpp
+++ b/src/helics/core/ProfilerBuffer.cpp
@@ -54,4 +54,24 @@ void ProfilerBuffer::writeFile()
     mBuffers.clear();
 }
 
+void ProfilerBuffer::setOutputFile(std::string fileName, bool append)
+{
+    if (fileName.empty()) {
+        mFileName.clear();
+        return;
+    }
+    mFileName = std::move(fileName);
+    if (append) {
+        return;
+    }
+
+    std::ofstream file;
+    // can't enable exception now because of gcc bug that raises ios_base::failure with useless
+    // message file.exceptions(file.exceptions() | std::ios::failbit);
+    file.open(mFileName, std::ios::out | std::ios::trunc);
+    if (file.fail()) {
+        throw std::ios_base::failure(std::strerror(errno));
+    }
+}
+
 }  // namespace helics
diff --git a/src/helics/core/ProfilerBuffer.hpp b/src/helics/core/ProfilerBuffer.hpp
index 28f454dbca..7028e6f05e 100644
--- a/src/helics/core/ProfilerBuffer.hpp
+++ b/src/helics/core/ProfilerBuffer.hpp
@@ -17,7 +17,13 @@ class ProfilerBuffer {
     void addMessage(const std::string& data);
     void addMessage(std::string&& data);
     void writeFile();
-    void setOutputFile(std::string fileName) { mFileName = std::move(fileName); }
+    /** specify the output file for writing the profiler information to
+    @details the file will be cleared when the output file is set unless the append parameter is
+    specified as true
+    @param fileName the name of the file to write the profile to
+    @param append if set to true the output file will be appended instead of cleared on first use
+    */
+    void setOutputFile(std::string fileName, bool append = false);
 
   private:
     std::vector<std::string> mBuffers;
diff --git a/tests/helics/system_tests/profilingTests.cpp b/tests/helics/system_tests/profilingTests.cpp
index 74481fe1a2..f2d8091d4a 100644
--- a/tests/helics/system_tests/profilingTests.cpp
+++ b/tests/helics/system_tests/profilingTests.cpp
@@ -315,6 +315,68 @@ TEST(profiling_tests, save_file)
     std::filesystem::remove("save_profile.txt");
 }
 
+TEST(profiling_tests, save_file_append)
+{
+    {
+        std::ofstream out("save_profile_app.txt");
+        out << "APPENDING_TO_FILE" << std::endl;
+    }
+    helics::FederateInfo fi(CORE_TYPE_TO_TEST);
+    fi.coreInitString = "--autobroker --profiler_append=save_profile_app.txt";
+
+    auto Fed = std::make_shared<helics::Federate>("test1", fi);
+
+    Fed->enterExecutingMode();
+    Fed->finalize();
+    helics::cleanupHelicsLibrary();
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    helics::cleanupHelicsLibrary();
+
+    std::vector<std::string> mlog;
+    std::ifstream in("save_profile_app.txt");
+    // Check if object is valid
+    ASSERT_TRUE(in) << "Cannot open save_profile_app.txt";
+
+    std::string str;
+    // Read the next line from File until it reaches the end.
+    while (std::getline(in, str)) {
+        // Line contains string of length > 0 then save it in vector
+        if (!str.empty()) {
+            mlog.push_back(str);
+        }
+    }
+    // Close The File
+    in.close();
+
+    ASSERT_TRUE(!mlog.empty());
+    bool hasMarker{false};
+    EXPECT_NE(mlog.front().find("APPENDING_TO_FILE"), std::string::npos);
+    std::vector<std::int64_t> timeValues;
+    for (const auto& logM : mlog) {
+        if (logM.find("MARKER") != std::string::npos) {
+            hasMarker = true;
+        } else if (logM.find("<PROFILING>") != std::string::npos) {
+            std::smatch ml;
+            std::regex ptime("<([^|>]*)></PROFILING>");
+            if (std::regex_search(logM, ml, ptime)) {
+                timeValues.push_back(std::stoll(ml[1]));
+            }
+        }
+    }
+    EXPECT_TRUE(hasMarker);
+    std::int64_t current = 0LL;
+    bool increasing{true};
+    for (auto st : timeValues) {
+        if (st < current) {
+            increasing = false;
+        }
+        current = st;
+    }
+    EXPECT_TRUE(increasing);
+    std::filesystem::remove("save_profile_app.txt");
+}
+
 TEST(profiling_tests, broker_file_save)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);

From 842429814943472a9b353cc72f2e09d8980ba3ce Mon Sep 17 00:00:00 2001
From: Ryan Mast <3969255+nightlark@users.noreply.github.com>
Date: Wed, 28 Sep 2022 13:03:54 -0700
Subject: [PATCH 04/16] Enable batching CI jobs on Azure Pipelines (#2442)

Enable CI run batching for Azure pipelines workflow
---
 .ci/azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index 16e50421a8..5f9d4e9787 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -1,4 +1,5 @@
 trigger:
+  batch: true
   branches:
     exclude:
       - pre-commit/*

From 68aa1d0cb5ea752d2e92b99d71395f67f00e7507 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Fri, 30 Sep 2022 13:42:10 -0700
Subject: [PATCH 05/16] Iterative initialize (#2438)

* add the API calls for an iterative initialize operation

* initial code for iterative initialization

* add iterative init tests

* Apply suggestions from code review

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

* update doxygen comments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>
---
 .../application_api/AsyncFedCallInfo.hpp      |  28 +++--
 src/helics/application_api/Federate.cpp       |  72 ++++++++++-
 src/helics/application_api/Federate.hpp       |  27 ++++-
 src/helics/core/CommonCore.cpp                | 113 +++++++++++++-----
 src/helics/core/CommonCore.hpp                |   6 +-
 src/helics/core/Core.hpp                      |   7 +-
 src/helics/core/CoreBroker.cpp                |  67 ++++++++---
 src/helics/core/CoreBroker.hpp                |   7 +-
 src/helics/core/EmptyCore.cpp                 |   2 +-
 src/helics/core/EmptyCore.hpp                 |   3 +-
 src/helics/core/FederateState.cpp             |  17 ++-
 src/helics/core/FederateState.hpp             |  11 +-
 src/helics/core/TimeCoordinatorProcessing.cpp |  12 +-
 src/helics/cpp98/Federate.hpp                 |  46 +++++--
 .../shared_api_library/FederateExport.cpp     |  42 +++++++
 .../shared_api_library/backup/helics/helics.h | 100 +++++++++++-----
 .../backup/helics/helics_api.h                |  10 +-
 src/helics/shared_api_library/helicsCore.h    |  48 ++++++--
 .../helics/application_api/FederateTests.cpp  |  73 ++++++++++-
 tests/helics/core/FederateState-tests.cpp     |   6 +-
 tests/helics/system_tests/ErrorTests.cpp      |  45 +++++++
 21 files changed, 609 insertions(+), 133 deletions(-)

diff --git a/src/helics/application_api/AsyncFedCallInfo.hpp b/src/helics/application_api/AsyncFedCallInfo.hpp
index d4de4cca29..b379345996 100644
--- a/src/helics/application_api/AsyncFedCallInfo.hpp
+++ b/src/helics/application_api/AsyncFedCallInfo.hpp
@@ -15,15 +15,23 @@ namespace helics {
 /** helper class for Federate info that holds the futures for asynchronous calls*/
 class AsyncFedCallInfo {
   public:
-    std::future<bool> initFuture; /**future for the Enter initialization call*/
-    std::future<IterationResult> execFuture; /** future for the enter execution mode call*/
-    std::future<Time> timeRequestFuture; /** future for the timeRequest call*/
-    std::future<iteration_time>
-        timeRequestIterativeFuture; /** future for the time request iterative call*/
-    std::future<void> finalizeFuture; /** future for the finalize call*/
-    std::atomic<int> queryCounter{0};  //!< counter for the number of queries
-    std::map<int, std::future<std::string>>
-        inFlightQueries;  //!< the queries that are actually in flight at a given time
-    std::function<bool()> asyncCheck;  //!< external function for checking async completion
+    /**future for the Enter initialization call*/
+    std::future<bool> initFuture;
+    /** future for the enter execution mode call*/
+    std::future<IterationResult> execFuture;
+    /** future for the timeRequest call*/
+    std::future<Time> timeRequestFuture;
+    /** future for the time request iterative call*/
+    std::future<iteration_time> timeRequestIterativeFuture;
+    /** future for the finalize call*/
+    std::future<void> finalizeFuture;
+    /** future for the iterative init call*/
+    std::future<void> initIterativeFuture;
+    /** counter for the number of queries */
+    std::atomic<int> queryCounter{0};
+    /** the queries that are actually in flight at a given time */
+    std::map<int, std::future<std::string>> inFlightQueries;
+    /** external function for checking async completion */
+    std::function<bool()> asyncCheck;
 };
 }  // namespace helics
diff --git a/src/helics/application_api/Federate.cpp b/src/helics/application_api/Federate.cpp
index e1278a53b1..c0d4e3be0c 100644
--- a/src/helics/application_api/Federate.cpp
+++ b/src/helics/application_api/Federate.cpp
@@ -293,6 +293,8 @@ bool Federate::isAsyncOperationCompleted() const
             return (asyncInfo->timeRequestIterativeFuture.wait_for(wait_delay) == ready);
         case Modes::PENDING_FINALIZE:
             return (asyncInfo->finalizeFuture.wait_for(wait_delay) == ready);
+        case Modes::PENDING_ITERATIVE_INIT:
+            return (asyncInfo->initIterativeFuture.wait_for(wait_delay) == ready);
         default:
             return (asyncInfo->asyncCheck) ? asyncInfo->asyncCheck() : false;
     }
@@ -326,6 +328,70 @@ void Federate::enterInitializingModeComplete()
     }
 }
 
+void Federate::enterInitializingModeIterative()
+{
+    auto cm = currentMode.load();
+    switch (cm) {
+        case Modes::STARTUP:
+            try {
+                coreObject->enterInitializingMode(fedID, IterationRequest::FORCE_ITERATION);
+            }
+            catch (const HelicsException&) {
+                updateFederateMode(Modes::ERROR_STATE);
+                throw;
+            }
+            break;
+        case Modes::PENDING_ITERATIVE_INIT:
+            enterInitializingModeIterativeComplete();
+            break;
+        default:
+            throw(InvalidFunctionCall("cannot call iterative initialization from current state"));
+    }
+}
+
+void Federate::enterInitializingModeIterativeAsync()
+{
+    auto cm = currentMode.load();
+    if (cm == Modes::STARTUP) {
+        auto asyncInfo = asyncCallInfo->lock();
+        if (currentMode.compare_exchange_strong(cm, Modes::PENDING_ITERATIVE_INIT)) {
+            asyncInfo->initIterativeFuture = std::async(std::launch::async, [this]() {
+                coreObject->enterInitializingMode(fedID, IterationRequest::FORCE_ITERATION);
+            });
+        }
+    } else if (cm == Modes::PENDING_ITERATIVE_INIT) {
+        return;
+    } else {
+        // everything else is an error
+        throw(InvalidFunctionCall(
+            "cannot request iterations in initializing mode if already past that mode"));
+    }
+}
+
+void Federate::enterInitializingModeIterativeComplete()
+{
+    switch (currentMode.load()) {
+        case Modes::PENDING_ITERATIVE_INIT: {
+            auto asyncInfo = asyncCallInfo->lock();
+            try {
+                asyncInfo->initIterativeFuture.get();
+                updateFederateMode(Modes::STARTUP);
+            }
+            catch (const std::exception&) {
+                updateFederateMode(Modes::ERROR_STATE);
+                throw;
+            }
+        } break;
+        case Modes::STARTUP:
+            // odd call since it would do nothing but not an error
+            break;
+        default:
+            throw(InvalidFunctionCall(
+                "cannot call enterInitializingModeIterativeComplete function without first calling "
+                "enterInitializingModeIterativeAsync function "));
+    }
+}
+
 IterationResult Federate::enterExecutingMode(IterationRequest iterate)
 {
     IterationResult res = IterationResult::NEXT_STEP;
@@ -920,6 +986,8 @@ void Federate::updateFederateMode(Modes newMode)
     }
     if (modeUpdateCallback) {
         switch (oldMode) {
+            case Modes::PENDING_ITERATIVE_INIT:
+                break;
             case Modes::PENDING_INIT:
                 modeUpdateCallback(newMode, Modes::STARTUP);
                 break;
@@ -953,8 +1021,8 @@ void Federate::updateFederateMode(Modes newMode)
             executingEntryCallback();
         }
     }
-    if (cosimulationTerminationCallback) {
-        if (newMode == Modes::FINALIZE || newMode == Modes::ERROR_STATE) {
+    if (newMode == Modes::FINALIZE || newMode == Modes::ERROR_STATE) {
+        if (cosimulationTerminationCallback) {
             cosimulationTerminationCallback();
         }
     }
diff --git a/src/helics/application_api/Federate.hpp b/src/helics/application_api/Federate.hpp
index d63389375f..f3401d0020 100644
--- a/src/helics/application_api/Federate.hpp
+++ b/src/helics/application_api/Federate.hpp
@@ -60,7 +60,7 @@ class HELICS_CXX_EXPORT Federate {
         /** error state no core communication is possible but values can be retrieved */
         ERROR_STATE = 4,
         // the following states are for asynchronous operations
-        /** indicator that the federate is pending entry to initialization state */
+        /** indicator that the federate is pending entry to initialization mode */
         PENDING_INIT = 5,
         /** state pending EnterExecution State */
         PENDING_EXEC = 6,
@@ -71,7 +71,10 @@ class HELICS_CXX_EXPORT Federate {
         /** state that the federate is pending a finalize call */
         PENDING_FINALIZE = 9,
         /** the simulation has finished normally but everything is still connected */
-        FINISHED = 10
+        FINISHED = 10,
+
+        /** the simulation is pending an iterative call to initializing mode */
+        PENDING_ITERATIVE_INIT = 12,
     };
 
   protected:
@@ -167,6 +170,26 @@ class HELICS_CXX_EXPORT Federate {
     enterInitializingModeAsync if call any other time it will throw an InvalidFunctionCall
     exception*/
     void enterInitializingModeComplete();
+
+    /** iterate in the created mode.
+    @details  the call will block until all federates have flagged they are ready for the next stage
+    of initialization all federates requesting iterations on the created mode will be notified they
+    can continue with setup.
+    */
+    void enterInitializingModeIterative();
+
+    /** iterate in the created mode.
+    @details  the call will not block but a call to \ref enterInitializingModeIterativeComplete
+    should be made to complete the call sequence
+    */
+    void enterInitializingModeIterativeAsync();
+
+    /** second part of the async process for entering initialization mode iterative call after a
+    call to enterInitializingModeIterativeAsync; if called any other time it will throw an
+    InvalidFunctionCall exception. The federate will be in the created state(or ERROR state) after
+    this call*/
+    void enterInitializingModeIterativeComplete();
+
     /** enter the normal execution mode
     @details call will block until all federates have entered this mode
     @param iterate an optional flag indicating the desired iteration mode
diff --git a/src/helics/core/CommonCore.cpp b/src/helics/core/CommonCore.cpp
index aeceb192ea..eda0ca103e 100644
--- a/src/helics/core/CommonCore.cpp
+++ b/src/helics/core/CommonCore.cpp
@@ -573,40 +573,66 @@ static void generateFederateException(const FederateState* fed)
             throw(HelicsException(fed->lastErrorString()));
     }
 }
-
-bool CommonCore::enterInitializingMode(LocalFederateId federateID)
+bool CommonCore::enterInitializingMode(LocalFederateId federateID, IterationRequest request)
 {
     auto* fed = getFederateAt(federateID);
     if (fed == nullptr) {
         throw(InvalidIdentifier("federateID not valid for Entering Init"));
     }
+    switch (request) {
+        case IterationRequest::HALT_OPERATIONS:
+            return finalize(federateID), false;
+        case IterationRequest::ERROR_CONDITION:
+            return localError(federateID, 34, "error condition called in enterInitializingMode"),
+                   false;
+        case IterationRequest::FORCE_ITERATION:
+        case IterationRequest::ITERATE_IF_NEEDED:
+            if (fed->isCallbackFederate()) {
+                // callback federates cannot iterate in startup
+                request = IterationRequest::NO_ITERATIONS;
+            }
+    }
     switch (fed->getState()) {
         case FederateStates::CREATED:
             break;
         case FederateStates::INITIALIZING:
-            return false;
+            if (request == IterationRequest::NO_ITERATIONS) {
+                return false;
+            }
+            [[fallthrough]];
         default:
             throw(InvalidFunctionCall("May only enter initializing state from created state"));
     }
 
     bool exp = false;
     // only enter this loop once per federate
-    if (fed->init_requested.compare_exchange_strong(exp, true)) {
+    if (fed->initRequested.compare_exchange_strong(exp, true)) {
         ActionMessage m(CMD_INIT);
         m.source_id = fed->global_id.load();
+        if (request != IterationRequest::NO_ITERATIONS) {
+            setIterationFlags(m, request);
+            fed->initIterating.store(true);
+            initIterations.store(true);
+        }
+
         addActionMessage(m);
 
         if (fed->isCallbackFederate()) {
             return false;
         }
-        auto check = fed->enterInitializingMode();
-        if (check != IterationResult::NEXT_STEP) {
-            fed->init_requested = false;
-            if (check == IterationResult::HALTED) {
+        auto check = fed->enterInitializingMode(request);
+        fed->initRequested = false;
+        switch (check) {
+            case IterationResult::NEXT_STEP:
+            case IterationResult::ITERATING:
+                break;
+            case IterationResult::HALTED:
                 throw(HelicsSystemFailure());
-            }
-            generateFederateException(fed);
+            default:
+                generateFederateException(fed);
+                break;
         }
+
         return true;
     }
     throw(InvalidFunctionCall("federate already has requested entry to initializing State"));
@@ -3130,6 +3156,9 @@ void CommonCore::processPriorityCommand(ActionMessage&& command)
                                                   BrokerState::INITIALIZING)) {
                             // make sure we only do this once
                             ActionMessage init(CMD_INIT);
+                            if (initIterations.load()) {
+                                setActionFlag(init, iteration_requested_flag);
+                            }
                             checkDependencies();
                             init.source_id = global_broker_id_local;
                             init.dest_id = parent_broker_id;
@@ -3608,7 +3637,11 @@ void CommonCore::processCommand(ActionMessage&& command)
                 if (transitionBrokerState(BrokerState::CONNECTED,
                                           BrokerState::INITIALIZING)) {  // make sure we only
                                                                          // do this once
-                    checkDependencies();
+                    if (initIterations) {
+                        setActionFlag(command, iteration_requested_flag);
+                    } else {
+                        checkDependencies();
+                    }
                     command.source_id = global_broker_id_local;
                     transmit(parent_route_id, command);
                 } else if (checkActionFlag(command, observer)) {
@@ -3619,31 +3652,47 @@ void CommonCore::processCommand(ActionMessage&& command)
 
         } break;
         case CMD_INIT_GRANT:
-            if (transitionBrokerState(
-                    BrokerState::INITIALIZING,
-                    BrokerState::OPERATING)) {  // forward the grant to all federates
-                if (filterFed != nullptr) {
-                    filterFed->organizeFilterOperations();
+            if (checkActionFlag(command, iteration_requested_flag)) {
+                if (initIterations) {
+                    if (transitionBrokerState(BrokerState::INITIALIZING, BrokerState::CONNECTED)) {
+                        loopFederates.apply([&command](auto& fed) {
+                            if (fed->initIterating.load()) {
+                                fed->addAction(command);
+                            }
+                        });
+                    } else if (checkActionFlag(command, observer_flag)) {
+                        routeMessage(command);
+                    }
+                    initIterations.store(false);
                 }
+            } else {
+                if (transitionBrokerState(
+                        BrokerState::INITIALIZING,
+                        BrokerState::OPERATING)) {  // forward the grant to all federates
+                    if (filterFed != nullptr) {
+                        filterFed->organizeFilterOperations();
+                    }
 
-                loopFederates.apply([&command](auto& fed) { fed->addAction(command); });
-                if (filterFed != nullptr && (filterTiming || globalTime)) {
-                    filterFed->handleMessage(command);
-                }
-                if (translatorFed != nullptr) {
-                    translatorFed->handleMessage(command);
-                }
-                timeCoord->enteringExecMode();
-                auto res = timeCoord->checkExecEntry();
-                if (res == MessageProcessingResult::NEXT_STEP) {
-                    enteredExecutionMode = true;
-                }
-                if (!timeCoord->hasActiveTimeDependencies()) {
-                    timeCoord->disconnect();
+                    loopFederates.apply([&command](auto& fed) { fed->addAction(command); });
+                    if (filterFed != nullptr && (filterTiming || globalTime)) {
+                        filterFed->handleMessage(command);
+                    }
+                    if (translatorFed != nullptr) {
+                        translatorFed->handleMessage(command);
+                    }
+                    timeCoord->enteringExecMode();
+                    auto res = timeCoord->checkExecEntry();
+                    if (res == MessageProcessingResult::NEXT_STEP) {
+                        enteredExecutionMode = true;
+                    }
+                    if (!timeCoord->hasActiveTimeDependencies()) {
+                        timeCoord->disconnect();
+                    }
+                } else if (checkActionFlag(command, observer_flag)) {
+                    routeMessage(command);
                 }
-            } else if (checkActionFlag(command, observer_flag)) {
-                routeMessage(command);
             }
+
             break;
 
         case CMD_SEND_MESSAGE:
diff --git a/src/helics/core/CommonCore.hpp b/src/helics/core/CommonCore.hpp
index 9218d3542c..940f0d4ec6 100644
--- a/src/helics/core/CommonCore.hpp
+++ b/src/helics/core/CommonCore.hpp
@@ -98,7 +98,8 @@ class CommonCore: public Core, public BrokerBase {
     virtual int getErrorCode() const override final;
     virtual std::string getErrorMessage() const override final;
     virtual void finalize(LocalFederateId federateID) override final;
-    virtual bool enterInitializingMode(LocalFederateId federateID) override final;
+    virtual bool enterInitializingMode(LocalFederateId federateID,
+                                       IterationRequest request) override final;
     virtual void setCoreReadyToInit() override final;
     virtual IterationResult
         enterExecutingMode(LocalFederateId federateID,
@@ -485,6 +486,9 @@ class CommonCore: public Core, public BrokerBase {
     /// airlocks for updating filter operators and other functions
     std::array<gmlc::containers::AirLock<std::any>, 4> dataAirlocks;
     gmlc::concurrency::TriggerVariable disconnection;  //!< controller for the disconnection process
+    /// flag indicating that one or more federates has requested iterative initialization
+    std::atomic<bool> initIterations{false};
+
   private:
     // generate a filter Federate
     void generateFilterFederate();
diff --git a/src/helics/core/Core.hpp b/src/helics/core/Core.hpp
index eeb9cfbb0a..02c8ed8523 100644
--- a/src/helics/core/Core.hpp
+++ b/src/helics/core/Core.hpp
@@ -155,11 +155,16 @@ class Core {
     /**
      * Change the federate state to the Initializing state.
      *
+     *@param federateID  the identifier of the federate
+     *@param iterate  the requested iteration mode, ITERATE_IF_NEEDED will operate identically to
+     *FORCE_ITERATION in this case
+     *
      * May only be invoked in Created state otherwise an error is thrown
      * for callback federates this call passes full control to the core
      @return will return true if the call resulted in Initializing mode being reached
      */
-    virtual bool enterInitializingMode(LocalFederateId federateID) = 0;
+    virtual bool enterInitializingMode(LocalFederateId federateID,
+                                       IterationRequest iterate = NO_ITERATION) = 0;
 
     /** set the core to ready to enter init
     @details this function only needs to be called for cores that don't have any federates but may
diff --git a/src/helics/core/CoreBroker.cpp b/src/helics/core/CoreBroker.cpp
index 4daaefb490..88dc024074 100644
--- a/src/helics/core/CoreBroker.cpp
+++ b/src/helics/core/CoreBroker.cpp
@@ -1458,26 +1458,46 @@ void CoreBroker::processInitCommand(ActionMessage& cmd)
                 break;
             }
             brk->state = ConnectionState::INIT_REQUESTED;
+
             if (brk->_observer && getBrokerState() >= BrokerState::OPERATING) {
                 if (isRootc) {
                     ActionMessage grant(CMD_INIT_GRANT, global_broker_id_local, cmd.source_id);
+                    if (checkActionFlag(cmd, iteration_requested_flag)) {
+                        setActionFlag(grant, iteration_requested_flag);
+                    }
                     setActionFlag(grant, observer_flag);
                     transmit(brk->route, grant);
                 } else {
                     transmit(parent_route_id, cmd);
                 }
             } else {
+                if (checkActionFlag(cmd, iteration_requested_flag)) {
+                    brk->initIterating = true;
+                    initIterating = true;
+                }
                 if (allInitReady()) {
                     if (isRootc) {
-                        LOG_TIMING(global_broker_id_local, "root", "entering initialization mode");
-                        LOG_SUMMARY(global_broker_id_local, "root", generateFederationSummary());
-                        executeInitializationOperations();
+                        if (initIterating) {
+                            executeInitializationOperations(true);
+                        } else {
+                            LOG_TIMING(global_broker_id_local,
+                                       "root",
+                                       "entering initialization mode");
+                            LOG_SUMMARY(global_broker_id_local,
+                                        "root",
+                                        generateFederationSummary());
+                            executeInitializationOperations(false);
+                        }
+
                     } else {
                         LOG_TIMING(global_broker_id_local,
                                    getIdentifier(),
                                    "entering initialization mode");
                         checkDependencies();
                         cmd.source_id = global_broker_id_local;
+                        if (initIterating) {
+                            setActionFlag(cmd, iteration_requested_flag);
+                        }
                         transmit(parent_route_id, cmd);
                     }
                 }
@@ -1497,20 +1517,21 @@ void CoreBroker::processInitCommand(ActionMessage& cmd)
             auto* brk = getBrokerById(GlobalBrokerId(cmd.source_id));
             if (brk != nullptr) {
                 brk->state = ConnectionState::CONNECTED;
+                brk->initIterating = false;
             }
         } break;
         case CMD_INIT_GRANT:
             if (!checkActionFlag(cmd, observer_flag)) {
-                if (brokerKey == universalKey) {
-                    LOG_SUMMARY(global_broker_id_local,
-                                getIdentifier(),
-                                "Broker started with universal key");
-                }
-                setBrokerState(BrokerState::OPERATING);
-                for (const auto& brk : mBrokers) {
-                    transmit(brk.route, cmd);
-                }
-                {
+                if (checkActionFlag(cmd, iteration_requested_flag)) {
+                    executeInitializationOperations(true);
+                } else {
+                    if (brokerKey == universalKey) {
+                        LOG_SUMMARY(global_broker_id_local,
+                                    getIdentifier(),
+                                    "Broker started with universal key");
+                    }
+                    setBrokerState(BrokerState::OPERATING);
+                    broadcast(cmd);
                     timeCoord->enteringExecMode();
                     auto res = timeCoord->checkExecEntry();
                     if (res == MessageProcessingResult::NEXT_STEP) {
@@ -2443,8 +2464,26 @@ void CoreBroker::broadcast(ActionMessage& cmd)
     }
 }
 
-void CoreBroker::executeInitializationOperations()
+void CoreBroker::executeInitializationOperations(bool iterating)
 {
+    if (iterating) {
+        ActionMessage m(CMD_INIT_GRANT);
+        m.source_id = global_broker_id_local;
+        setActionFlag(m, iteration_requested_flag);
+        setBrokerState(BrokerState::CONNECTED);
+        mBrokers.apply([&m, this](auto& broker) {
+            if ((!broker._nonLocal) && (broker.state < ConnectionState::DISCONNECTED)) {
+                if (broker.initIterating) {
+                    m.dest_id = broker.global_id;
+                    transmit(broker.route, m);
+                    broker.initIterating = false;
+                    broker.state = ConnectionState::CONNECTED;
+                }
+            }
+        });
+        initIterating = false;
+        return;
+    }
     if (brokerKey == universalKey) {
         LOG_SUMMARY(global_broker_id_local, getIdentifier(), "Broker started with universal key");
     }
diff --git a/src/helics/core/CoreBroker.hpp b/src/helics/core/CoreBroker.hpp
index 2bcbc75a57..24340d0b6b 100644
--- a/src/helics/core/CoreBroker.hpp
+++ b/src/helics/core/CoreBroker.hpp
@@ -79,8 +79,8 @@ class BasicBrokerInfo {
     bool _route_key{false};  //!< indicator that the broker has a unique route id
     bool _sent_disconnect_ack{false};  //!< indicator that the disconnect ack has been sent
     bool _disable_ping{false};  //!< indicator that the broker doesn't respond to pings
-    bool _observer{false};  // indicator that the broker is an observer
-    // 1 byte gap
+    bool _observer{false};  //!< indicator that the broker is an observer
+    bool initIterating{false};  //!< indicator that initIteration was requested
     std::string routeInfo;  //!< string describing the connection information for the route
     explicit BasicBrokerInfo(std::string_view brokerName): name(brokerName) {}
 };
@@ -100,6 +100,7 @@ class CoreBroker: public Broker, public BrokerBase {
     std::atomic<bool> _isRoot{false};  //!< set to true if this object is a root broker
     bool isRootc{false};
     bool connectionEstablished{false};  //!< the setup has been received by the core loop thread
+    bool initIterating{false};  //!< using init iterations in some cores
     int routeCount = 1;  //!< counter for creating new routes;
     /// container for all federates
     gmlc::containers::
@@ -187,7 +188,7 @@ class CoreBroker: public Broker, public BrokerBase {
     route_id fillMessageRouteInformation(ActionMessage& mess);
 
     /** handle initialization operations*/
-    void executeInitializationOperations();
+    void executeInitializationOperations(bool iterating);
     /** get an index for an airlock, function is threadsafe*/
     uint16_t getNextAirlockIndex();
     /** verify the broker key contained in a message
diff --git a/src/helics/core/EmptyCore.cpp b/src/helics/core/EmptyCore.cpp
index 3f49ec7593..3d6b3f99be 100644
--- a/src/helics/core/EmptyCore.cpp
+++ b/src/helics/core/EmptyCore.cpp
@@ -97,7 +97,7 @@ void EmptyCore::finalize(LocalFederateId /*federateID*/) {}
 
 void EmptyCore::setCoreReadyToInit() {}
 
-bool EmptyCore::enterInitializingMode(LocalFederateId /*federateID*/)
+bool EmptyCore::enterInitializingMode(LocalFederateId /*federateID*/, IterationRequest /*request*/)
 {
     return false;
 }
diff --git a/src/helics/core/EmptyCore.hpp b/src/helics/core/EmptyCore.hpp
index b18015e8fb..4cfebe0aa2 100644
--- a/src/helics/core/EmptyCore.hpp
+++ b/src/helics/core/EmptyCore.hpp
@@ -38,7 +38,8 @@ class EmptyCore: public Core {
     virtual int getErrorCode() const override;
     virtual std::string getErrorMessage() const override;
     virtual void finalize(LocalFederateId federateID) override;
-    virtual bool enterInitializingMode(LocalFederateId federateID) override;
+    virtual bool enterInitializingMode(LocalFederateId federateID,
+                                       IterationRequest request) override;
     virtual void setCoreReadyToInit() override;
     virtual IterationResult enterExecutingMode(LocalFederateId federateID,
                                                IterationRequest iterate = NO_ITERATION) override;
diff --git a/src/helics/core/FederateState.cpp b/src/helics/core/FederateState.cpp
index 6eaadcf359..80aa1ea0ca 100644
--- a/src/helics/core/FederateState.cpp
+++ b/src/helics/core/FederateState.cpp
@@ -464,14 +464,19 @@ IterationResult FederateState::waitSetup()
     return ret;
 }
 
-IterationResult FederateState::enterInitializingMode()
+IterationResult FederateState::enterInitializingMode(IterationRequest request)
 {
     if (try_lock()) {  // only enter this loop once per federate
         auto ret = processQueue();
         unlock();
-        if (ret == MessageProcessingResult::NEXT_STEP) {
-            time_granted = initialTime;
-            allowed_send_time = initialTime;
+        initIterating = false;
+        switch (ret) {
+            case MessageProcessingResult::NEXT_STEP:
+                time_granted = initialTime;
+                allowed_send_time = initialTime;
+                break;
+            case MessageProcessingResult::ITERATING:
+                break;
         }
         return static_cast<IterationResult>(ret);
     }
@@ -487,7 +492,7 @@ IterationResult FederateState::enterInitializingMode()
             break;
         case FederateStates::CREATED:
             unlock();
-            return enterInitializingMode();
+            return enterInitializingMode(request);
         default:  // everything >= INITIALIZING
             ret = IterationResult::NEXT_STEP;
             break;
@@ -1196,7 +1201,7 @@ void FederateState::callbackProcessing() noexcept
     auto initError = (state == FederateStates::ERRORED);
     bool error_cmd{false};
 
-    if (!init_requested) {
+    if (!initRequested) {
         // don't run callback processing before the user calls enterInit
         return;
     }
diff --git a/src/helics/core/FederateState.hpp b/src/helics/core/FederateState.hpp
index 71d485649b..a45e5c14c2 100644
--- a/src/helics/core/FederateState.hpp
+++ b/src/helics/core/FederateState.hpp
@@ -111,10 +111,12 @@ class FederateState {
     std::int32_t grantTimeoutTimeIndex{-1};  //!< time index for the grant time out timer;
   public:
     /** atomic flag indicating this federate has requested entry to initialization */
-    std::atomic<bool> init_requested{false};
+    std::atomic<bool> initRequested{false};
     // temporary
     std::atomic<bool> requestingMode{false};
 
+    std::atomic<bool> initIterating{false};
+
   private:
     bool iterating{false};  //!< the federate is iterating at a time step
     bool timeGranted_mode{false};  //!< indicator if the federate is in a granted state or a
@@ -377,8 +379,11 @@ class FederateState {
     // the next 5 functions are the processing functions that actually process the queue
     /** process until the federate has verified its membership and assigned a global id number*/
     IterationResult waitSetup();
-    /** process until the initialization state has been entered or there is a failure*/
-    IterationResult enterInitializingMode();
+    /** process until the initialization state has been entered, an iteration request granted or
+    there is a failure
+    @param request the desired iteration condition
+    @return the result of the iteration request*/
+    IterationResult enterInitializingMode(IterationRequest request);
     /** function to call when entering execution state
     @param iterate indicator of whether the fed should iterate if need be or not
     @param sendRequest generates the local actionMessage inside the function leaving to false
diff --git a/src/helics/core/TimeCoordinatorProcessing.cpp b/src/helics/core/TimeCoordinatorProcessing.cpp
index 0f2b4af395..74b34ddae4 100644
--- a/src/helics/core/TimeCoordinatorProcessing.cpp
+++ b/src/helics/core/TimeCoordinatorProcessing.cpp
@@ -61,9 +61,15 @@ std::tuple<FederateStates, MessageProcessingResult, bool>
                 if (checkActionFlag(cmd, observer_flag)) {
                     timeCoord->setDynamicJoining();
                 }
-                newState = FederateStates::INITIALIZING;
-                newMode = true;
-                proc = MessageProcessingResult::NEXT_STEP;
+                if (checkActionFlag(cmd, iteration_requested_flag)) {
+                    newState = FederateStates::CREATED;
+                    newMode = false;
+                    proc = MessageProcessingResult::ITERATING;
+                } else {
+                    newState = FederateStates::INITIALIZING;
+                    newMode = true;
+                    proc = MessageProcessingResult::NEXT_STEP;
+                }
             }
             break;
         case CMD_EXEC_REQUEST:
diff --git a/src/helics/cpp98/Federate.hpp b/src/helics/cpp98/Federate.hpp
index 024e001e22..b9ccf05380 100644
--- a/src/helics/cpp98/Federate.hpp
+++ b/src/helics/cpp98/Federate.hpp
@@ -359,6 +359,15 @@ class Federate {
     {
         return helicsFederateGetState(fed, HELICS_NULL_POINTER);
     }
+    /** called after one of the async calls and will indicate true if an async operation has
+    completed
+    @details this should only be called from the same thread as the one that called the initial
+    async call and will return false if called when no async operation is in flight*/
+    bool isAsyncOperationCompleted() const
+    {
+        // returns int, 1 = true, 0 = false
+        return helicsFederateIsAsyncOperationCompleted(fed, HELICS_NULL_POINTER) != HELICS_FALSE;
+    }
     /** enter the initialization mode after all interfaces have been defined
     @details  the call will block until all federates have entered initialization mode
     */
@@ -374,15 +383,7 @@ class Federate {
     {
         helicsFederateEnterInitializingModeAsync(fed, hThrowOnError());
     }
-    /** called after one of the async calls and will indicate true if an async operation has
-    completed
-    @details only call from the same thread as the one that called the initial async call and will
-    return false if called when no async operation is in flight*/
-    bool isAsyncOperationCompleted() const
-    {
-        // returns int, 1 = true, 0 = false
-        return helicsFederateIsAsyncOperationCompleted(fed, HELICS_NULL_POINTER) > 0;
-    }
+
     /** second part of the async process for entering initializationState call after a call to
     enterInitializingModeAsync if call any other time it will throw an InvalidFunctionCall
     exception*/
@@ -390,6 +391,33 @@ class Federate {
     {
         helicsFederateEnterInitializingModeComplete(fed, hThrowOnError());
     }
+
+    /** iterate in the created mode.
+    @details  the call will block until all federates have flagged they are ready for the next stage
+    of initialization all federates requesting iterations on the created mode will be notified they
+    can continue with setup.
+    */
+    void enterInitializingModeIterative()
+    {
+        helicsFederateEnterInitializingModeIterative(fed, hThrowOnError());
+    }
+    /** iterate in the created mode.
+    @details  the call will not block but a call to \ref enterInitializingModeIterativeComplete
+    should be made to complete the call sequence
+    */
+    void enterInitializingModeIterativeAsync()
+    {
+        helicsFederateEnterInitializingModeIterativeAsync(fed, hThrowOnError());
+    }
+
+    /** second part of the async process for entering initializationModeIterative call after a call
+    to enterInitializingModeIterativeAsync; if called any other time it will throw an
+    InvalidFunctionCall exception*/
+    void enterInitializingModeIterativeComplete()
+    {
+        helicsFederateEnterInitializingModeIterativeComplete(fed, hThrowOnError());
+    }
+
     /** enter the normal execution mode
     @details call will block until all federates have entered this mode
     @param iterate an optional flag indicating the desired iteration mode
diff --git a/src/helics/shared_api_library/FederateExport.cpp b/src/helics/shared_api_library/FederateExport.cpp
index d44c9b2b93..b1748f9307 100644
--- a/src/helics/shared_api_library/FederateExport.cpp
+++ b/src/helics/shared_api_library/FederateExport.cpp
@@ -921,6 +921,48 @@ void helicsFederateEnterInitializingModeComplete(HelicsFederate fed, HelicsError
     }
 }
 
+void helicsFederateEnterInitializingModeIterative(HelicsFederate fed, HelicsError* err)
+{
+    auto* fedObj = getFed(fed, err);
+    if (fedObj == nullptr) {
+        return;
+    }
+    try {
+        fedObj->enterInitializingModeIterative();
+    }
+    catch (...) {
+        helicsErrorHandler(err);
+    }
+}
+
+void helicsFederateEnterInitializingModeIterativeAsync(HelicsFederate fed, HelicsError* err)
+{
+    auto* fedObj = getFed(fed, err);
+    if (fedObj == nullptr) {
+        return;
+    }
+    try {
+        fedObj->enterInitializingModeIterativeAsync();
+    }
+    catch (...) {
+        helicsErrorHandler(err);
+    }
+}
+
+void helicsFederateEnterInitializingModeIterativeComplete(HelicsFederate fed, HelicsError* err)
+{
+    auto* fedObj = getFed(fed, err);
+    if (fedObj == nullptr) {
+        return;
+    }
+    try {
+        fedObj->enterInitializingModeIterativeComplete();
+    }
+    catch (...) {
+        helicsErrorHandler(err);
+    }
+}
+
 void helicsFederateEnterExecutingMode(HelicsFederate fed, HelicsError* err)
 {
     auto* fedObj = getFed(fed, err);
diff --git a/src/helics/shared_api_library/backup/helics/helics.h b/src/helics/shared_api_library/backup/helics/helics.h
index 4fb71ee7c8..3415c6f740 100644
--- a/src/helics/shared_api_library/backup/helics/helics.h
+++ b/src/helics/shared_api_library/backup/helics/helics.h
@@ -303,7 +303,7 @@ typedef enum { /* NOLINT */
                HELICS_PROPERTY_TIME_INPUT_DELAY = 148,
                /** the property controlling output delay for a federate*/
                HELICS_PROPERTY_TIME_OUTPUT_DELAY = 150,
-               /** specify the maximum time of a federate (callback federates only*/
+               /** specify the maximum time of a federate (callback federates only)*/
                HELICS_PROPERTY_TIME_MAXTIME = 152,
                /** the property specifying a timeout to trigger actions if the time for granting
                   exceeds a certain threshold*/
@@ -320,7 +320,9 @@ typedef enum { /* NOLINT */
                   \ref HelicsLogLevels*/
                HELICS_PROPERTY_INT_CONSOLE_LOG_LEVEL = 274,
                /** integer property controlling the size of the log buffer*/
-               HELICS_PROPERTY_INT_LOG_BUFFER = 276
+               HELICS_PROPERTY_INT_LOG_BUFFER = 276,
+               /** integer property specifying an index group*/
+               HELICS_PROPERTY_INT_INDEX_GROUP = 282
 } HelicsProperties;
 
 /** result returned for requesting the value of an invalid/unknown property */
@@ -1276,8 +1278,7 @@ HELICS_EXPORT HelicsFederate helicsCreateCombinationFederateFromConfig(const cha
 /**
 * Create a callback federate from a federate info object.
 *
-* @details Callback federates are both value federates and message federates, objects can be used in all functions
-*                      that take a HelicsCombination object as an argument
+* @details Callback federates are combination federates that run a series of callback for execution in a completely automated fashion.
 *
 * @param fedName A string with the name of the federate, can be NULL or an empty string to pull the default name from fi.
 * @param fi The federate info object that contains details on the federate.
@@ -1285,15 +1286,15 @@ HELICS_EXPORT HelicsFederate helicsCreateCombinationFederateFromConfig(const cha
 * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
 
 *
-* @return An opaque value federate object nullptr if the object creation failed.
+* @return An opaque value federate object; nullptr if the object creation failed.
 */
 HELICS_EXPORT HelicsFederate helicsCreateCallbackFederate(const char* fedName, HelicsFederateInfo fi, HelicsError* err);
 
 /**
 * Create a callback federate from a JSON file or JSON string or TOML file.
 *
-* @details callback federates are combination federates that run a series of callback for execution in a completely automated fashion.
-* the enterInitializingMode call transfer complete control of the federate to the Core and no further user interaction is expected
+* @details Callback federates are combination federates that run a series of callbacks for execution in a completely automated fashion.
+* The enterInitializingMode call transfers complete control of the federate to the Core and no further user interaction is expected.
 *
 * @param configFile A JSON file or a JSON string or TOML file that contains setup and configuration information.
 *
@@ -1702,7 +1703,7 @@ HELICS_EXPORT void helicsFederateEnterInitializingMode(HelicsFederate fed, Helic
 /**
  * Non blocking alternative to \ref helicsFederateEnterInitializingMode.
  *
- * @details The function helicsFederateEnterInitializationModeFinalize must be called to finish the operation.
+ * @details The function helicsFederateEnterInitializationModeComplete must be called to finish the operation.
  *
  * @param fed The federate to operate on.
  *
@@ -1711,24 +1712,58 @@ HELICS_EXPORT void helicsFederateEnterInitializingMode(HelicsFederate fed, Helic
 HELICS_EXPORT void helicsFederateEnterInitializingModeAsync(HelicsFederate fed, HelicsError* err);
 
 /**
- * Check if the current Asynchronous operation has completed.
+ * Complete the entry to initialize mode that was initiated with /ref heliceEnterInitializingModeAsync.
+ *
+ * @param fed The federate desiring to complete the initialization step.
+ *
+ * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
+ */
+HELICS_EXPORT void helicsFederateEnterInitializingModeComplete(HelicsFederate fed, HelicsError* err);
+
+/**
+ * Trigger a blocking call and return to created state after all federates have either triggered an iteration or waiting to enter
+ * initializing mode
+ *
+ * @details this call will return the federate to the created state to allow additional setup to occur with federates either iterating in
+ * the mode or waiting.
  *
  * @param fed The federate to operate on.
  *
  * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
+ */
+HELICS_EXPORT void helicsFederateEnterInitializingModeIterative(HelicsFederate fed, HelicsError* err);
+
+/**
+ * Non blocking alternative to \ref helicsFederateEnterInitializingModeIterative.
  *
- * @return HELICS_FALSE if not completed, HELICS_TRUE if completed.
+ * @details The function helicsFederateEnterInitializationModeIterativeComplete must be called to finish the operation.
+ *
+ * @param fed The federate to operate on.
+ *
+ * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
  */
-HELICS_EXPORT HelicsBool helicsFederateIsAsyncOperationCompleted(HelicsFederate fed, HelicsError* err);
+HELICS_EXPORT void helicsFederateEnterInitializingModeIterativeAsync(HelicsFederate fed, HelicsError* err);
 
 /**
- * Finalize the entry to initialize mode that was initiated with /ref heliceEnterInitializingModeAsync.
+ * Complete the call to initialize mode that was initiated with /ref heliceEnterInitializingModeIterativeAsync.  The federate will be in
+ * startup or error mode on return
  *
- * @param fed The federate desiring to complete the initialization step.
+ * @param fed The federate desiring to iterate to the startup mode again
  *
  * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
  */
-HELICS_EXPORT void helicsFederateEnterInitializingModeComplete(HelicsFederate fed, HelicsError* err);
+HELICS_EXPORT void helicsFederateEnterInitializingModeIterativeComplete(HelicsFederate fed, HelicsError* err);
+
+/**
+ * Check if the current Asynchronous operation has completed.
+ *
+ * @param fed The federate to operate on.
+ *
+ * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
+ *
+ * @return HELICS_FALSE if not completed, HELICS_TRUE if completed.
+ */
+HELICS_EXPORT HelicsBool helicsFederateIsAsyncOperationCompleted(HelicsFederate fed, HelicsError* err);
 
 /**
  * Request that the federate enter the Execution mode.
@@ -5062,7 +5097,7 @@ HELICS_EXPORT void
 * @param fed The federate to set the callback for.
 * @param initializingEntry A callback with signature void(HelicsBool iterating, void *userdata);
 * the bool parameter is set to true if the entry is iterative, therefore the first time this is called the bool is false
-* all subsequent times it is false
+* and all subsequent times it is true.
 *
 * @param userdata A pointer to user data that is passed to the function when executing.
 *
@@ -5077,10 +5112,10 @@ HELICS_EXPORT void helicsFederateInitializingEntryCallback(HelicsFederate fed,
 /**
 * Set callback for the entry to ExecutingMode.
 *
-* @details This callback will be executed once on first entry to executing Mode
+* @details This callback will be executed once on first entry to executingMode
 *
 * @param fed The federate to set the callback for.
-* @param executingEntry A callback with signature void( void *userdata);
+* @param executingEntry A callback with signature void(void *userdata);
 *
 * @param userdata A pointer to user data that is passed to the function when executing.
 *
@@ -5091,14 +5126,14 @@ HELICS_EXPORT void
     helicsFederateExecutingEntryCallback(HelicsFederate fed, void (*executingEntry)(void* userdata), void* userdata, HelicsError* err);
 
 /**
-* Set callback for cosimulation termination
+* Set callback for cosimulation termination.
 *
-* @details This callback will be executed once when the time advance of the federate/co-simulation has terminated
-* this may be called as part of the finalize operation, or when a maxTime signal is returned from requestTime or when an error is
-encountered
+* @details This callback will be executed once when the time advancement of the federate/co-simulation has terminated.
+* This may be called as part of the finalize operation, or when a maxTime signal is returned from requestTime or when an error is
+encountered.
 *
 * @param fed The federate to set the callback for.
-* @param cosimTermination A callback with signature void( void *userdata);
+* @param cosimTermination A callback with signature void(void *userdata);
 *
 * @param userdata A pointer to user data that is passed to the function when executing.
 *
@@ -5111,9 +5146,9 @@ HELICS_EXPORT void helicsFederateCosimulationTerminationCallback(HelicsFederate
                                                                  HelicsError* err);
 
 /**
-* Set callback for error handling
+* Set callback for error handling.
 *
-* @details This callback will be when a federate error is encountered
+* @details This callback will be called when a federate error is encountered.
 *
 * @param fed The federate to set the callback for.
 * @param errorHandler A callback with signature void(int errorCode, const char *errorString, void *userdata);
@@ -5131,9 +5166,9 @@ HELICS_EXPORT void helicsFederateErrorHandlerCallback(HelicsFederate fed,
 // void setNextTimeCallback(std::function<Time(Time)>
 // timeUpdateCallback){timeUpdateOperation2=std::move(timeUpdateCallback);timeUpdateOperation1=nullptr;}
 /**
-* Set callback for the next time update
+* Set callback for the next time update.
 *
-* @details This callback will be triggered to compute the next time update for a callback federate
+* @details This callback will be triggered to compute the next time update for a callback federate.
 *
 * @param fed The federate to set the callback for.
 * @param timeUpdate A callback with signature HelicsTime(HelicsTime time, void *userdata);
@@ -5151,12 +5186,13 @@ HELICS_EXPORT void helicsCallbackFederateNextTimeCallback(HelicsFederate fed,
 // void setNextTimeIterativeCallback(std::function<std::pair<Time,IterationRequest>(iteration_time)>
 // timeUpdateCallback){timeUpdateOperation1=std::move(timeUpdateCallback);}
 /**
-* Set callback for the next time update with iteration capability
+* Set callback for the next time update with iteration capability.
 *
-* @details This callback will be triggered to compute the next time update for a callback federate
+* @details This callback will be triggered to compute the next time update for a callback federate.
 *
 * @param fed The federate to set the callback for.
-* @param timeUpdate A callback with signature HelicsTime(HelicsTime time, void *userdata);
+* @param timeUpdate A callback with signature HelicsTime(HelicsTime time, HelicsIterationResult result, HelicsIterationRequest* iteration,
+void *userdata);
 *
 * @param userdata A pointer to user data that is passed to the function when executing.
 *
@@ -5165,15 +5201,15 @@ HELICS_EXPORT void helicsCallbackFederateNextTimeCallback(HelicsFederate fed,
 */
 HELICS_EXPORT void helicsCallbackFederateNextTimeIterativeCallback(
     HelicsFederate fed,
-    HelicsTime (*timeUpdate)(HelicsTime time, HelicsIterationResult, HelicsIterationRequest* iteration, void* userdata),
+    HelicsTime (*timeUpdate)(HelicsTime time, HelicsIterationResult result, HelicsIterationRequest* iteration, void* userdata),
     void* userdata,
     HelicsError* err);
 
 // void setInitializeCallback(std::function<IterationRequest()> initializeCallback){initializationOperation=std::move(initializeCallback); }
 /**
-* Set callback for initialization
+* Set callback for initialization.
 *
-* @details This callback will be executed when computing whether to iterate in itialization mode
+* @details This callback will be executed when computing whether to iterate in initialization mode.
 *
 * @param fed The federate to set the callback for.
 * @param initialize A callback with signature HelicsIterationRequest(void *userdata);
diff --git a/src/helics/shared_api_library/backup/helics/helics_api.h b/src/helics/shared_api_library/backup/helics/helics_api.h
index 74561fc449..5446dfceb6 100644
--- a/src/helics/shared_api_library/backup/helics/helics_api.h
+++ b/src/helics/shared_api_library/backup/helics/helics_api.h
@@ -143,7 +143,8 @@ typedef enum {
     HELICS_PROPERTY_INT_LOG_LEVEL = 271,
     HELICS_PROPERTY_INT_FILE_LOG_LEVEL = 272,
     HELICS_PROPERTY_INT_CONSOLE_LOG_LEVEL = 274,
-    HELICS_PROPERTY_INT_LOG_BUFFER = 276
+    HELICS_PROPERTY_INT_LOG_BUFFER = 276,
+    HELICS_PROPERTY_INT_INDEX_GROUP = 282
 } HelicsProperties;
 
 const int HELICS_INVALID_PROPERTY_VALUE = -972;
@@ -419,8 +420,11 @@ void helicsFederateFree(HelicsFederate fed);
 void helicsCloseLibrary(void);
 void helicsFederateEnterInitializingMode(HelicsFederate fed, HelicsError* err);
 void helicsFederateEnterInitializingModeAsync(HelicsFederate fed, HelicsError* err);
-HelicsBool helicsFederateIsAsyncOperationCompleted(HelicsFederate fed, HelicsError* err);
 void helicsFederateEnterInitializingModeComplete(HelicsFederate fed, HelicsError* err);
+void helicsFederateEnterInitializingModeIterative(HelicsFederate fed, HelicsError* err);
+void helicsFederateEnterInitializingModeIterativeAsync(HelicsFederate fed, HelicsError* err);
+void helicsFederateEnterInitializingModeIterativeComplete(HelicsFederate fed, HelicsError* err);
+HelicsBool helicsFederateIsAsyncOperationCompleted(HelicsFederate fed, HelicsError* err);
 void helicsFederateEnterExecutingMode(HelicsFederate fed, HelicsError* err);
 void helicsFederateEnterExecutingModeAsync(HelicsFederate fed, HelicsError* err);
 void helicsFederateEnterExecutingModeComplete(HelicsFederate fed, HelicsError* err);
@@ -768,7 +772,7 @@ void helicsCallbackFederateNextTimeCallback(HelicsFederate fed,
                                             HelicsError* err);
 void helicsCallbackFederateNextTimeIterativeCallback(
     HelicsFederate fed,
-    HelicsTime (*timeUpdate)(HelicsTime time, HelicsIterationResult, HelicsIterationRequest* iteration, void* userdata),
+    HelicsTime (*timeUpdate)(HelicsTime time, HelicsIterationResult result, HelicsIterationRequest* iteration, void* userdata),
     void* userdata,
     HelicsError* err);
 void helicsCallbackFederateInitializeCallback(HelicsFederate fed,
diff --git a/src/helics/shared_api_library/helicsCore.h b/src/helics/shared_api_library/helicsCore.h
index 7aeb61b4c8..02317f3672 100644
--- a/src/helics/shared_api_library/helicsCore.h
+++ b/src/helics/shared_api_library/helicsCore.h
@@ -998,7 +998,7 @@ HELICS_EXPORT void helicsFederateEnterInitializingMode(HelicsFederate fed, Helic
 /**
  * Non blocking alternative to \ref helicsFederateEnterInitializingMode.
  *
- * @details The function helicsFederateEnterInitializationModeFinalize must be called to finish the operation.
+ * @details The function helicsFederateEnterInitializationModeComplete must be called to finish the operation.
  *
  * @param fed The federate to operate on.
  *
@@ -1007,24 +1007,58 @@ HELICS_EXPORT void helicsFederateEnterInitializingMode(HelicsFederate fed, Helic
 HELICS_EXPORT void helicsFederateEnterInitializingModeAsync(HelicsFederate fed, HelicsError* err);
 
 /**
- * Check if the current Asynchronous operation has completed.
+ * Complete the entry to initialize mode that was initiated with /ref heliceEnterInitializingModeAsync.
+ *
+ * @param fed The federate desiring to complete the initialization step.
+ *
+ * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
+ */
+HELICS_EXPORT void helicsFederateEnterInitializingModeComplete(HelicsFederate fed, HelicsError* err);
+
+/**
+ * Trigger a blocking call and return to created state after all federates have either triggered an iteration or are waiting to enter
+ * initializing mode.
+ *
+ * @details This call will return the federate to the created state to allow additional setup to occur with federates either iterating in
+ * the mode or waiting.
  *
  * @param fed The federate to operate on.
  *
  * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
+ */
+HELICS_EXPORT void helicsFederateEnterInitializingModeIterative(HelicsFederate fed, HelicsError* err);
+
+/**
+ * Non blocking alternative to \ref helicsFederateEnterInitializingModeIterative.
  *
- * @return HELICS_FALSE if not completed, HELICS_TRUE if completed.
+ * @details The function helicsFederateEnterInitializationModeIterativeComplete must be called to finish the operation.
+ *
+ * @param fed The federate to operate on.
+ *
+ * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
  */
-HELICS_EXPORT HelicsBool helicsFederateIsAsyncOperationCompleted(HelicsFederate fed, HelicsError* err);
+HELICS_EXPORT void helicsFederateEnterInitializingModeIterativeAsync(HelicsFederate fed, HelicsError* err);
 
 /**
- * Finalize the entry to initialize mode that was initiated with /ref heliceEnterInitializingModeAsync.
+ * Complete the call to enter initializing mode Iterative that was initiated with /ref heliceEnterInitializingModeIterativeAsync.  The
+ * federate will be in created or error mode on return
  *
- * @param fed The federate desiring to complete the initialization step.
+ * @param fed The federate used in the corresponding async call
  *
  * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
  */
-HELICS_EXPORT void helicsFederateEnterInitializingModeComplete(HelicsFederate fed, HelicsError* err);
+HELICS_EXPORT void helicsFederateEnterInitializingModeIterativeComplete(HelicsFederate fed, HelicsError* err);
+
+/**
+ * Check if the current Asynchronous operation has completed.
+ *
+ * @param fed The federate to operate on.
+ *
+ * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
+ *
+ * @return HELICS_FALSE if not completed, HELICS_TRUE if completed.
+ */
+HELICS_EXPORT HelicsBool helicsFederateIsAsyncOperationCompleted(HelicsFederate fed, HelicsError* err);
 
 /**
  * Request that the federate enter the Execution mode.
diff --git a/tests/helics/application_api/FederateTests.cpp b/tests/helics/application_api/FederateTests.cpp
index a13347d8ab..3c166f6efb 100644
--- a/tests/helics/application_api/FederateTests.cpp
+++ b/tests/helics/application_api/FederateTests.cpp
@@ -55,8 +55,41 @@ TEST(federate_tests, federate_initialize_tests)
     Fed = nullptr;  // force the destructor
 }
 
+TEST(federate_tests, federate_initialize_iterate)
+{
+    helics::FederateInfo fi(CORE_TYPE_TO_TEST);
+    fi.coreInitString = "--autobroker";
+
+    auto Fed = std::make_shared<helics::Federate>("test1", fi);
+
+    auto core = Fed->getCorePointer();
+    ASSERT_TRUE((core));
+
+    auto name = std::string(core->getFederateName(Fed->getID()));
+
+    EXPECT_EQ(name, Fed->getName());
+    EXPECT_TRUE(Fed->getCurrentMode() == helics::Federate::Modes::STARTUP);
+    Fed->enterInitializingModeIterative();
+    EXPECT_TRUE(Fed->getCurrentMode() == helics::Federate::Modes::STARTUP);
+    Fed->enterInitializingModeIterative();
+    EXPECT_TRUE(Fed->getCurrentMode() == helics::Federate::Modes::STARTUP);
+    Fed->enterInitializingMode();
+    EXPECT_TRUE(Fed->getCurrentMode() == helics::Federate::Modes::INITIALIZING);
+    Fed->enterExecutingMode();
+    EXPECT_TRUE(Fed->getCurrentMode() == helics::Federate::Modes::EXECUTING);
+
+    // const auto& coreName = core->getIdentifier();
+    // const auto& fedName = Fed->getName();
+    // EXPECT_EQ(fedName+"_core", coreName);
+
+    // const auto& coreName = core->getIdentifier();
+    // const auto& fedName = Fed->getName();
+    // EXPECT_EQ(fedName+"_core", coreName);
+    Fed = nullptr;  // force the destructor
+}
+
 #ifdef HELICS_ENABLE_ZMQ_CORE
-TEST(federate_tests, federate_initialize_tests_json)
+TEST(federate_tests, federate_initialize_json)
 {
     helics::BrokerApp brk(helics::CoreType::ZMQ);
 
@@ -81,6 +114,44 @@ TEST(federate_tests, federate_initialize_tests_json)
     brk.waitForDisconnect();
 }
 
+TEST(federate_tests, federate_initialize_iteration_multiple)
+{
+    helics::BrokerApp brk(helics::CoreType::ZMQ);
+
+    helics::FederateInfo fi(helics::CoreType::ZMQ);
+
+    auto Fed1 = std::make_shared<helics::Federate>("test1", fi);
+    auto Fed2 = std::make_shared<helics::Federate>("test2", fi);
+
+    Fed1->enterInitializingModeAsync();
+    Fed2->enterInitializingModeIterative();
+    EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::PENDING_INIT);
+    EXPECT_EQ(Fed2->getCurrentMode(), helics::Federate::Modes::STARTUP);
+    EXPECT_FALSE(Fed1->isAsyncOperationCompleted());
+
+    Fed2->enterInitializingModeIterativeAsync();
+    EXPECT_TRUE(Fed2->getCurrentMode() == helics::Federate::Modes::PENDING_ITERATIVE_INIT ||
+                Fed2->getCurrentMode() == helics::Federate::Modes::STARTUP);
+    std::this_thread::yield();
+    int ii{0};
+    while (!Fed2->isAsyncOperationCompleted()) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(50));
+        if (++ii > 20) {
+            break;
+        }
+    }
+    EXPECT_TRUE(Fed2->isAsyncOperationCompleted());
+    Fed2->enterInitializingModeIterativeComplete();
+    EXPECT_EQ(Fed2->getCurrentMode(), helics::Federate::Modes::STARTUP);
+    Fed2->enterInitializingMode();
+    Fed1->enterInitializingModeComplete();
+    EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::INITIALIZING);
+    EXPECT_EQ(Fed2->getCurrentMode(), helics::Federate::Modes::INITIALIZING);
+    Fed1->disconnect();
+    Fed2->disconnect();
+    brk.waitForDisconnect();
+}
+
 #endif
 
 TEST(federate_tests, federate_initialize_tests_env)
diff --git a/tests/helics/core/FederateState-tests.cpp b/tests/helics/core/FederateState-tests.cpp
index 08c40d8a33..05e96058b0 100644
--- a/tests/helics/core/FederateState-tests.cpp
+++ b/tests/helics/core/FederateState-tests.cpp
@@ -48,7 +48,7 @@ TEST_F(federateStateTests, constructor)
     EXPECT_EQ(fs->getDependents().size(), 0U);
     EXPECT_TRUE(fs->local_id == helics::LocalFederateId{});
     EXPECT_TRUE(fs->global_id.load() == helics::GlobalFederateId{});
-    EXPECT_EQ(fs->init_requested, false);
+    EXPECT_EQ(fs->initRequested, false);
 
     EXPECT_EQ(fs->getCurrentIteration(), 0);
     EXPECT_EQ(fs->grantedTime(), helics::Time::minVal());
@@ -184,7 +184,9 @@ TEST_F(federateStateTests, basic_processmessage)
 
     // Test returning when the initialization state is entered
     cmd.setAction(helics::CMD_INIT_GRANT);
-    auto fs_process = std::async(std::launch::async, [&]() { return fs->enterInitializingMode(); });
+    auto fs_process = std::async(std::launch::async, [&]() {
+        return fs->enterInitializingMode(IterationRequest::NO_ITERATIONS);
+    });
     EXPECT_EQ(fs->getState(), FederateStates::CREATED);
     fs->addAction(cmd);
     fs_process.wait();
diff --git a/tests/helics/system_tests/ErrorTests.cpp b/tests/helics/system_tests/ErrorTests.cpp
index 0f998287df..1ca1fb1c82 100644
--- a/tests/helics/system_tests/ErrorTests.cpp
+++ b/tests/helics/system_tests/ErrorTests.cpp
@@ -188,6 +188,51 @@ TEST_F(error_tests, duplicate_publication_names2)
     broker->disconnect();
 }
 
+TEST_F(error_tests, duplicate_publication_names2_init_iteration)
+{
+    auto broker = AddBroker("test", 2);
+    AddFederates<helics::ValueFederate>("test", 1, broker, 1.0, "fed");
+    AddFederates<helics::ValueFederate>("test", 1, broker, 1.0, "fed");
+
+    auto fed1 = GetFederateAs<helics::ValueFederate>(0);
+    auto fed2 = GetFederateAs<helics::ValueFederate>(1);
+
+    fed1->registerGlobalPublication("testkey", "");
+    fed1->enterInitializingModeAsync();
+
+    fed2->enterInitializingModeIterative();
+
+    fed2->registerGlobalPublication("testkey", "");
+
+    bool gotException = false;
+    try {
+        fed2->enterInitializingMode();
+    }
+    catch (const helics::RegistrationFailure&) {
+        gotException = true;
+        EXPECT_TRUE(fed2->getCurrentMode() == helics::Federate::Modes::ERROR_STATE);
+        // this should do nothing
+        EXPECT_THROW(fed2->enterExecutingMode(), helics::InvalidFunctionCall);
+        EXPECT_TRUE(fed2->getCurrentMode() == helics::Federate::Modes::ERROR_STATE);
+    }
+
+    try {
+        fed1->enterInitializingModeComplete();
+    }
+    catch (const helics::RegistrationFailure&) {
+        gotException = true;
+        EXPECT_TRUE(fed1->getCurrentMode() == helics::Federate::Modes::ERROR_STATE);
+        // this should do nothing
+        EXPECT_THROW(fed1->enterExecutingMode(), helics::InvalidFunctionCall);
+        EXPECT_TRUE(fed1->getCurrentMode() == helics::Federate::Modes::ERROR_STATE);
+    }
+    EXPECT_TRUE(gotException);
+
+    fed1->finalize();
+    fed2->finalize();
+    broker->disconnect();
+}
+
 TEST_F(error_tests, duplicate_publication_names_auto_terminate)
 {
     auto broker = AddBroker("test", "-f 2");

From aa7f1bc2dedf82379d830219537ea2072b81eced Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Fri, 30 Sep 2022 18:10:13 -0700
Subject: [PATCH 06/16] Single thread fed (#2443)

* Enable the single thread option for federates and move the stoptime variable to the Federate.cpp vs the callback Federate.

* add single thread core flags and swap to the opt guarded structures

* update concurrency library

* use new delayedObject capabilities

* add custom targets for copying the generated header files

* rename custom target for copying files

* add some tests for the single thread federate

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update src/helics/application_api/FederateInfo.cpp

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>
---
 ThirdParty/concurrency                        |   2 +-
 .../application_api/CallbackFederate.cpp      |  28 +---
 .../application_api/CallbackFederate.hpp      |   5 -
 .../ConnectorFederateManager.cpp              |   5 +-
 .../ConnectorFederateManager.hpp              |   9 +-
 src/helics/application_api/Federate.cpp       | 103 ++++++++++--
 src/helics/application_api/Federate.hpp       |  13 +-
 src/helics/application_api/FederateInfo.cpp   |  15 +-
 .../application_api/MessageFederate.cpp       |  25 ++-
 .../MessageFederateManager.cpp                |  30 ++--
 .../MessageFederateManager.hpp                |  17 +-
 src/helics/application_api/ValueFederate.cpp  |  25 ++-
 .../application_api/ValueFederateManager.cpp  |   9 +-
 .../application_api/ValueFederateManager.hpp  |  15 +-
 src/helics/common/GuardedTypes.hpp            |  12 ++
 src/helics/core/CommonCore.cpp                |   9 +-
 src/helics/core/CoreBroker.cpp                |   6 +-
 src/helics/core/CoreTypes.hpp                 |  10 ++
 src/helics/core/helics_definitions.hpp        |   5 +
 src/helics/helics_enums.h                     |  10 +-
 src/helics/shared_api_library/CMakeLists.txt  |  29 ++++
 .../shared_api_library/backup/helics/helics.h |  18 ++-
 .../backup/helics/helics_api.h                |  10 +-
 .../application_api/CallbackFederateTests.cpp |  14 +-
 .../helics/application_api/FederateTests.cpp  | 151 ++++++++++--------
 .../ValueFederateAdditionalTests.cpp          |  10 +-
 .../application_api/ValueFederateKeyTests.cpp |  99 +++++++++---
 tests/helics/application_api/testFixtures.hpp |   5 +-
 .../application_api/testFixtures_shared.hpp   |   7 +-
 .../shared_library/CallbackFederateTests.cpp  |   5 +-
 tests/helics/system_tests/ErrorTests.cpp      |  27 ++++
 tests/helics/system_tests/TimingTests.cpp     |  82 ++++++++++
 32 files changed, 588 insertions(+), 222 deletions(-)

diff --git a/ThirdParty/concurrency b/ThirdParty/concurrency
index 1ffdb2b7d9..0783d98b5f 160000
--- a/ThirdParty/concurrency
+++ b/ThirdParty/concurrency
@@ -1 +1 @@
-Subproject commit 1ffdb2b7d9894d8dd4e3f284dff1a7052a785ac9
+Subproject commit 0783d98b5fe4968972be6870e7a0526ad46abc38
diff --git a/src/helics/application_api/CallbackFederate.cpp b/src/helics/application_api/CallbackFederate.cpp
index 518c12e377..6e733d68a9 100644
--- a/src/helics/application_api/CallbackFederate.cpp
+++ b/src/helics/application_api/CallbackFederate.cpp
@@ -112,7 +112,7 @@ std::pair<Time, IterationRequest> CallbackFederate::operateCallback(iteration_ti
     auto rval = std::make_pair((mEventTriggered) ? Time::maxVal() : timeZero,
                                IterationRequest::NO_ITERATIONS);
 
-    if (newTime.grantedTime >= mFinalTime) {
+    if (newTime.grantedTime >= mStopTime) {
         rval = std::make_pair(Time::maxVal(), IterationRequest::HALT_OPERATIONS);
     } else if (nextTimeOperation1) {
         rval = nextTimeOperation1(newTime);
@@ -127,24 +127,6 @@ std::pair<Time, IterationRequest> CallbackFederate::operateCallback(iteration_ti
     return rval;
 }
 
-void CallbackFederate::setProperty(int32_t property, double val)
-{
-    if (property == HELICS_PROPERTY_TIME_MAXTIME) {
-        mFinalTime = val;
-        return;
-    }
-    Federate::setProperty(property, val);
-}
-
-void CallbackFederate::setProperty(int32_t property, Time val)
-{
-    if (property == HELICS_PROPERTY_TIME_MAXTIME) {
-        mFinalTime = val;
-        return;
-    }
-    Federate::setProperty(property, val);
-}
-
 void CallbackFederate::setFlagOption(int32_t property, bool val)
 {
     if (property == HELICS_FLAG_EVENT_TRIGGERED) {
@@ -154,14 +136,6 @@ void CallbackFederate::setFlagOption(int32_t property, bool val)
     Federate::setFlagOption(property, val);
 }
 
-Time CallbackFederate::getTimeProperty(int32_t property) const
-{
-    if (property == HELICS_PROPERTY_TIME_MAXTIME) {
-        return mFinalTime;
-    }
-    return Federate::getTimeProperty(property);
-}
-
 void CallbackFederate::finalizeCallback()
 {
     finalizeOperations();
diff --git a/src/helics/application_api/CallbackFederate.hpp b/src/helics/application_api/CallbackFederate.hpp
index 8ca607901d..7640cb7d87 100644
--- a/src/helics/application_api/CallbackFederate.hpp
+++ b/src/helics/application_api/CallbackFederate.hpp
@@ -87,18 +87,13 @@ class HELICS_CXX_EXPORT CallbackFederate: public CombinationFederate {
         nextTimeOperation1 = nullptr;
         nextTimeOperation2 = nullptr;
     }
-    using Federate::setProperty;
-    virtual void setProperty(int32_t property, double val) override;
-    virtual void setProperty(int32_t property, Time val) override;
     virtual void setFlagOption(int32_t property, bool val) override;
-    virtual Time getTimeProperty(int32_t property) const override;
 
   private:
     void loadOperator();
     // pointer for the
     std::shared_ptr<CallbackFederateOperator> op;
     friend CallbackFederateOperator;
-    Time mFinalTime{Time::maxVal()};
     bool mEventTriggered{false};
     std::function<IterationRequest()> initializationOperation;
     std::function<std::pair<Time, IterationRequest>(iteration_time)> nextTimeOperation1;
diff --git a/src/helics/application_api/ConnectorFederateManager.cpp b/src/helics/application_api/ConnectorFederateManager.cpp
index ef04e64b52..a45fb1a399 100644
--- a/src/helics/application_api/ConnectorFederateManager.cpp
+++ b/src/helics/application_api/ConnectorFederateManager.cpp
@@ -16,9 +16,10 @@ SPDX-License-Identifier: BSD-3-Clause
 namespace helics {
 ConnectorFederateManager::ConnectorFederateManager(Core* coreObj,
                                                    Federate* ffed,
-                                                   LocalFederateId id):
+                                                   LocalFederateId id,
+                                                   bool singleThreaded):
     coreObject(coreObj),
-    fed(ffed), fedID(id)
+    filters(!singleThreaded), translators(!singleThreaded), fed(ffed), fedID(id)
 {
 }
 ConnectorFederateManager::~ConnectorFederateManager() = default;
diff --git a/src/helics/application_api/ConnectorFederateManager.hpp b/src/helics/application_api/ConnectorFederateManager.hpp
index b34b093bd2..bc8ec5e211 100644
--- a/src/helics/application_api/ConnectorFederateManager.hpp
+++ b/src/helics/application_api/ConnectorFederateManager.hpp
@@ -25,7 +25,10 @@ class ConnectorFederateManager {
   public:
     /** construct from a pointer to a core and a specified federate id
      */
-    ConnectorFederateManager(Core* coreObj, Federate* fFed, LocalFederateId id);
+    ConnectorFederateManager(Core* coreObj,
+                             Federate* fFed,
+                             LocalFederateId id,
+                             bool singleThreaded);
     /** destructor */
     ~ConnectorFederateManager();
 
@@ -101,8 +104,8 @@ class ConnectorFederateManager {
 
   private:
     Core* coreObject{nullptr};
-    shared_guarded<gmlc::containers::StringMappedVector<std::unique_ptr<Filter>>> filters;
-    shared_guarded<gmlc::containers::StringMappedVector<Translator>> translators;
+    shared_guarded_opt<gmlc::containers::StringMappedVector<std::unique_ptr<Filter>>> filters;
+    shared_guarded_opt<gmlc::containers::StringMappedVector<Translator>> translators;
     Federate* fed = nullptr;  //!< pointer back to the message Federate
     const LocalFederateId fedID;  //!< storage for the federate ID
 };
diff --git a/src/helics/application_api/Federate.cpp b/src/helics/application_api/Federate.cpp
index c0d4e3be0c..4d43c83ec5 100644
--- a/src/helics/application_api/Federate.cpp
+++ b/src/helics/application_api/Federate.cpp
@@ -48,6 +48,8 @@ Federate::Federate(std::string_view fedName, const FederateInfo& fi): mName(fedN
         mName = fi.defName;
     }
 
+    singleThreadFederate = fi.checkFlagProperty(defs::Flags::SINGLE_THREAD_FEDERATE, false);
+
     if (fi.coreName.empty()) {
         if (!fi.forceNewCore) {
             coreObject = CoreFactory::findJoinableCoreOfType(fi.coreType);
@@ -109,12 +111,16 @@ Federate::Federate(std::string_view fedName, const FederateInfo& fi): mName(fedN
     // this call will throw an error on failure
     fedID = coreObject->registerFederate(mName, fi);
     nameSegmentSeparator = fi.separator;
-    strictConfigChecking = fi.checkFlagProperty(HELICS_FLAG_STRICT_CONFIG_CHECKING, true);
+    strictConfigChecking = fi.checkFlagProperty(defs::Flags::STRICT_CONFIG_CHECKING, true);
+
     useJsonSerialization = fi.useJsonSerialization;
     observerMode = fi.observer;
     mCurrentTime = coreObject->getCurrentTime(fedID);
     asyncCallInfo = std::make_unique<shared_guarded_m<AsyncFedCallInfo>>();
-    cManager = std::make_unique<ConnectorFederateManager>(coreObject.get(), this, fedID);
+    cManager = std::make_unique<ConnectorFederateManager>(coreObject.get(),
+                                                          this,
+                                                          fedID,
+                                                          singleThreadFederate);
 }
 
 Federate::Federate(std::string_view fedname, CoreApp& core, const FederateInfo& fi):
@@ -150,10 +156,16 @@ Federate::Federate(std::string_view fedName,
     fedID = coreObject->registerFederate(mName, fi);
     nameSegmentSeparator = fi.separator;
     observerMode = fi.observer;
-    strictConfigChecking = fi.checkFlagProperty(HELICS_FLAG_STRICT_CONFIG_CHECKING, true);
+    strictConfigChecking = fi.checkFlagProperty(defs::Flags::STRICT_CONFIG_CHECKING, true);
+    singleThreadFederate = fi.checkFlagProperty(defs::Flags::SINGLE_THREAD_FEDERATE, false);
     mCurrentTime = coreObject->getCurrentTime(fedID);
-    asyncCallInfo = std::make_unique<shared_guarded_m<AsyncFedCallInfo>>();
-    cManager = std::make_unique<ConnectorFederateManager>(coreObject.get(), this, fedID);
+    if (!singleThreadFederate) {
+        asyncCallInfo = std::make_unique<shared_guarded_m<AsyncFedCallInfo>>();
+    }
+    cManager = std::make_unique<ConnectorFederateManager>(coreObject.get(),
+                                                          this,
+                                                          fedID,
+                                                          singleThreadFederate);
 }
 
 Federate::Federate(std::string_view fedName, const std::string& configString):
@@ -260,6 +272,10 @@ void Federate::enteringInitializingMode(IterationResult iterating)
 
 void Federate::enterInitializingModeAsync()
 {
+    if (singleThreadFederate) {
+        throw(InvalidFunctionCall(
+            "Async function calls and methods are not allowed for single thread federates"));
+    }
     auto cm = currentMode.load();
     if (cm == Modes::STARTUP) {
         auto asyncInfo = asyncCallInfo->lock();
@@ -278,6 +294,9 @@ void Federate::enterInitializingModeAsync()
 
 bool Federate::isAsyncOperationCompleted() const
 {
+    if (singleThreadFederate) {
+        return false;
+    }
     constexpr std::chrono::seconds wait_delay{0};
     auto ready = std::future_status::ready;
 
@@ -302,6 +321,9 @@ bool Federate::isAsyncOperationCompleted() const
 
 void Federate::enterInitializingModeComplete()
 {
+    if (singleThreadFederate) {
+        return enterInitializingMode();
+    }
     switch (currentMode.load()) {
         case Modes::PENDING_INIT: {
             auto asyncInfo = asyncCallInfo->lock();
@@ -472,6 +494,10 @@ void Federate::handleError(int errorCode, std::string_view errorString, bool noT
 
 void Federate::enterExecutingModeAsync(IterationRequest iterate)
 {
+    if (singleThreadFederate) {
+        throw(InvalidFunctionCall(
+            "Async function calls and methods are not allowed for single thread federates"));
+    }
     switch (currentMode) {
         case Modes::STARTUP: {
             auto eExecFunc = [this, iterate]() {
@@ -509,6 +535,9 @@ void Federate::enterExecutingModeAsync(IterationRequest iterate)
 
 IterationResult Federate::enterExecutingModeComplete()
 {
+    if (singleThreadFederate) {
+        return enterExecutingMode();
+    }
     switch (currentMode.load()) {
         case Modes::PENDING_EXEC: {
             auto asyncInfo = asyncCallInfo->lock();
@@ -529,6 +558,9 @@ IterationResult Federate::enterExecutingModeComplete()
 
 void Federate::setAsyncCheck(std::function<bool()> asyncCheck)
 {
+    if (singleThreadFederate) {
+        return;
+    }
     auto asyncInfo = asyncCallInfo->lock();
     asyncInfo->asyncCheck = std::move(asyncCheck);
 }
@@ -545,11 +577,19 @@ const std::string& Federate::getTag(std::string_view tag) const
 
 void Federate::setProperty(int32_t option, double timeValue)
 {
+    if (option == defs::Properties::STOPTIME) {
+        mStopTime = timeValue;
+        return;
+    }
     coreObject->setTimeProperty(fedID, option, timeValue);
 }
 
 void Federate::setProperty(int32_t option, Time timeValue)
 {
+    if (option == defs::Properties::STOPTIME) {
+        mStopTime = timeValue;
+        return;
+    }
     coreObject->setTimeProperty(fedID, option, timeValue);
 }
 
@@ -560,6 +600,9 @@ void Federate::setProperty(int32_t option, int32_t optionValue)
 
 Time Federate::getTimeProperty(int32_t option) const
 {
+    if (option == defs::Properties::STOPTIME) {
+        return mStopTime;
+    }
     return coreObject->getTimeProperty(fedID, option);
 }
 
@@ -646,10 +689,10 @@ void Federate::setErrorHandlerCallback(std::function<void(int, std::string_view)
 
 void Federate::setFlagOption(int flag, bool flagValue)
 {
-    if (flag == HELICS_FLAG_OBSERVER && currentMode < Modes::INITIALIZING) {
+    if (flag == defs::Flags::OBSERVER && currentMode < Modes::INITIALIZING) {
         observerMode = flagValue;
     }
-    if (flag == HELICS_FLAG_AUTOMATED_TIMEREQUEST) {
+    if (flag == defs::Flags::AUTOMATED_TIME_REQUEST) {
         retriggerTimeRequest = flagValue;
         return;
     }
@@ -658,13 +701,16 @@ void Federate::setFlagOption(int flag, bool flagValue)
 
 bool Federate::getFlagOption(int flag) const
 {
-    if (flag == HELICS_FLAG_USE_JSON_SERIALIZATION) {
-        return useJsonSerialization;
-    }
-    if (flag == HELICS_FLAG_AUTOMATED_TIMEREQUEST) {
-        return retriggerTimeRequest;
+    switch (flag) {
+        case defs::Flags::USE_JSON_SERIALIZATION:
+            return useJsonSerialization;
+        case defs::Flags::AUTOMATED_TIME_REQUEST:
+            return retriggerTimeRequest;
+        case defs::Flags::SINGLE_THREAD_FEDERATE:
+            return singleThreadFederate;
+        default:
+            return coreObject->getFlagOption(fedID, flag);
     }
-    return coreObject->getFlagOption(fedID, flag);
 }
 void Federate::finalize()
 {  // since finalize is called in the destructor we can't allow any potential virtual function calls
@@ -712,6 +758,10 @@ void Federate::finalize()
 
 void Federate::finalizeAsync()
 {
+    if (singleThreadFederate) {
+        throw(InvalidFunctionCall(
+            "Async function calls and methods are not allowed for single thread federates"));
+    }
     switch (currentMode) {
         case Modes::PENDING_INIT:
             enterInitializingModeComplete();
@@ -742,6 +792,9 @@ void Federate::finalizeAsync()
 /** complete the asynchronous terminate pair*/
 void Federate::finalizeComplete()
 {
+    if (singleThreadFederate) {
+        return finalize();
+    }
     if (currentMode == Modes::PENDING_FINALIZE) {
         auto asyncInfo = asyncCallInfo->lock();
         asyncInfo->finalizeFuture.get();
@@ -899,6 +952,10 @@ iteration_time Federate::requestTimeIterative(Time nextInternalTimeStep, Iterati
 
 void Federate::requestTimeAsync(Time nextInternalTimeStep)
 {
+    if (singleThreadFederate) {
+        throw(InvalidFunctionCall(
+            "Async function calls and methods are not allowed for single thread federates"));
+    }
     auto exp = Modes::EXECUTING;
     if (currentMode.compare_exchange_strong(exp, Modes::PENDING_TIME)) {
         preTimeRequestOperations(nextInternalTimeStep, false);
@@ -914,6 +971,10 @@ void Federate::requestTimeAsync(Time nextInternalTimeStep)
 
 void Federate::requestTimeIterativeAsync(Time nextInternalTimeStep, IterationRequest iterate)
 {
+    if (singleThreadFederate) {
+        throw(InvalidFunctionCall(
+            "Async function calls and methods are not allowed for single thread federates"));
+    }
     auto exp = Modes::EXECUTING;
     if (currentMode.compare_exchange_strong(exp, Modes::PENDING_ITERATIVE_TIME)) {
         preTimeRequestOperations(nextInternalTimeStep, iterate != IterationRequest::NO_ITERATIONS);
@@ -945,9 +1006,9 @@ Time Federate::requestTimeComplete()
 @return the granted time step*/
 iteration_time Federate::requestTimeIterativeComplete()
 {
-    auto asyncInfo = asyncCallInfo->lock();
     auto exp = Modes::PENDING_ITERATIVE_TIME;
     if (currentMode.compare_exchange_strong(exp, Modes::EXECUTING)) {
+        auto asyncInfo = asyncCallInfo->lock();
         auto iterativeTime = asyncInfo->timeRequestIterativeFuture.get();
         switch (iterativeTime.state) {
             case IterationResult::NEXT_STEP:
@@ -1478,6 +1539,9 @@ QueryId Federate::queryAsync(std::string_view target,
                              std::string_view queryStr,
                              HelicsSequencingModes mode)
 {
+    if (singleThreadFederate) {
+        throw(helics::InvalidFunctionCall("No Async calls are allowed in single thread federates"));
+    }
     auto queryFut = std::async(std::launch::async, [this, target, queryStr, mode]() {
         return coreObject->query(target, queryStr, mode);
     });
@@ -1490,6 +1554,9 @@ QueryId Federate::queryAsync(std::string_view target,
 
 QueryId Federate::queryAsync(std::string_view queryStr, HelicsSequencingModes mode)
 {
+    if (singleThreadFederate) {
+        throw(helics::InvalidFunctionCall("No Async calls are allowed in single thread federates"));
+    }
     auto queryFut =
         std::async(std::launch::async, [this, queryStr, mode]() { return query(queryStr, mode); });
     auto asyncInfo = asyncCallInfo->lock();
@@ -1501,6 +1568,11 @@ QueryId Federate::queryAsync(std::string_view queryStr, HelicsSequencingModes mo
 
 std::string Federate::queryComplete(QueryId queryIndex)  // NOLINT
 {
+    if (singleThreadFederate) {
+        return generateJsonErrorResponse(
+            JsonErrorCodes::METHOD_NOT_ALLOWED,
+            "Async queries are not allowed when using single thread federates");
+    }
     auto asyncInfo = asyncCallInfo->lock();
     auto fnd = asyncInfo->inFlightQueries.find(queryIndex.value());
     if (fnd != asyncInfo->inFlightQueries.end()) {
@@ -1517,6 +1589,9 @@ void Federate::setQueryCallback(const std::function<std::string(std::string_view
 
 bool Federate::isQueryCompleted(QueryId queryIndex) const  // NOLINT
 {
+    if (singleThreadFederate) {
+        return false;
+    }
     auto asyncInfo = asyncCallInfo->lock();
     auto fnd = asyncInfo->inFlightQueries.find(queryIndex.value());
     if (fnd != asyncInfo->inFlightQueries.end()) {
diff --git a/src/helics/application_api/Federate.hpp b/src/helics/application_api/Federate.hpp
index f3401d0020..0e7fd3813a 100644
--- a/src/helics/application_api/Federate.hpp
+++ b/src/helics/application_api/Federate.hpp
@@ -22,12 +22,10 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <string>
 #include <utility>
 
-namespace gmlc {
-namespace libguarded {
-    template<class T, class M>
-    class shared_guarded;
-}  // namespace libguarded
-}  // namespace gmlc
+namespace gmlc::libguarded {
+template<class T, class M>
+class shared_guarded;
+}  // namespace gmlc::libguarded
 
 /**
  * HELICS Application API
@@ -88,12 +86,15 @@ class HELICS_CXX_EXPORT Federate {
     bool observerMode{false};
     /** allow to retrigger time requests from callbacks (user specified)*/
     bool retriggerTimeRequest{false};
+    /*** specify that the federate will only be used on a single thread*/
+    bool singleThreadFederate{false};
 
   private:
     LocalFederateId fedID;  //!< the federate ID of the object for use in the core
   protected:
     std::shared_ptr<Core> coreObject;  //!< reference to the core simulation API
     Time mCurrentTime = Time::minVal();  //!< the current simulation time
+    Time mStopTime = Time::maxVal();  //!< the stopping time for the federate
   private:
     /// pointer to a class defining the async call information
     std::unique_ptr<gmlc::libguarded::shared_guarded<AsyncFedCallInfo, std::mutex>> asyncCallInfo;
diff --git a/src/helics/application_api/FederateInfo.cpp b/src/helics/application_api/FederateInfo.cpp
index 239248ced5..983f097155 100644
--- a/src/helics/application_api/FederateInfo.cpp
+++ b/src/helics/application_api/FederateInfo.cpp
@@ -73,6 +73,8 @@ static constexpr frozen::unordered_map<std::string_view, int, 67> propStringsTra
     {"offset", HELICS_PROPERTY_TIME_OFFSET},
     {"timeoffset", HELICS_PROPERTY_TIME_OFFSET},
     {"time_offset", HELICS_PROPERTY_TIME_OFFSET},
+    {"stop_time", HELICS_PROPERTY_TIME_STOPTIME},
+    {"stoptime", HELICS_PROPERTY_TIME_STOPTIME},
     {"rtlead", HELICS_PROPERTY_TIME_RT_LEAD},
     {"rtlag", HELICS_PROPERTY_TIME_RT_LAG},
     {"rttolerance", HELICS_PROPERTY_TIME_RT_TOLERANCE},
@@ -131,7 +133,7 @@ static constexpr frozen::unordered_map<std::string_view, int, 67> propStringsTra
     {"logBuffer", HELICS_PROPERTY_INT_LOG_BUFFER},
     {"log_buffer", HELICS_PROPERTY_INT_LOG_BUFFER}};
 
-static constexpr frozen::unordered_map<std::string_view, int, 89> flagStringsTranslations{
+static constexpr frozen::unordered_map<std::string_view, int, 95> flagStringsTranslations{
     {"source_only", HELICS_FLAG_SOURCE_ONLY},
     {"sourceonly", HELICS_FLAG_SOURCE_ONLY},
     {"sourceOnly", HELICS_FLAG_SOURCE_ONLY},
@@ -195,6 +197,12 @@ static constexpr frozen::unordered_map<std::string_view, int, 89> flagStringsTra
     {"single_thread_federate", HELICS_FLAG_SINGLE_THREAD_FEDERATE},
     {"singlethreadfederate", HELICS_FLAG_SINGLE_THREAD_FEDERATE},
     {"singleThreadFederate", HELICS_FLAG_SINGLE_THREAD_FEDERATE},
+    {"single_thread_core", HELICS_FLAG_SINGLE_THREAD_CORE},
+    {"singlethreadcore", HELICS_FLAG_SINGLE_THREAD_CORE},
+    {"singleThreadCore", HELICS_FLAG_SINGLE_THREAD_CORE},
+    {"multi_thread_core", HELICS_FLAG_MULTI_THREAD_CORE},
+    {"multithreadcore", HELICS_FLAG_MULTI_THREAD_CORE},
+    {"multiThreadCore", HELICS_FLAG_MULTI_THREAD_CORE},
     {"force_logging_flush", HELICS_FLAG_FORCE_LOGGING_FLUSH},
     {"forceloggingflush", HELICS_FLAG_FORCE_LOGGING_FLUSH},
     {"forceLoggingFlush", HELICS_FLAG_FORCE_LOGGING_FLUSH},
@@ -576,6 +584,11 @@ std::unique_ptr<helicsCLI11App> FederateInfo::makeCLIApp()
            [this](Time val) { setProperty(HELICS_PROPERTY_TIME_PERIOD, val); },
            "the execution cycle of the federate (default in ms)")
         ->configurable(false);
+    app->add_option_function<Time>(
+           "--stoptime",
+           [this](Time val) { setProperty(HELICS_PROPERTY_TIME_STOPTIME, val); },
+           "the maximum simulation time of a federate (default in ms)")
+        ->configurable(false);
     app->add_option_function<Time>(
            "--timedelta",
            [this](Time val) { setProperty(HELICS_PROPERTY_TIME_DELTA, val); },
diff --git a/src/helics/application_api/MessageFederate.cpp b/src/helics/application_api/MessageFederate.cpp
index cdf17ab093..29f059b98d 100644
--- a/src/helics/application_api/MessageFederate.cpp
+++ b/src/helics/application_api/MessageFederate.cpp
@@ -21,26 +21,38 @@ namespace helics {
 MessageFederate::MessageFederate(std::string_view fedName, const FederateInfo& fi):
     Federate(fedName, fi)
 {
-    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(), this, getID());
+    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(),
+                                                         this,
+                                                         getID(),
+                                                         singleThreadFederate);
 }
 MessageFederate::MessageFederate(std::string_view fedName,
                                  const std::shared_ptr<Core>& core,
                                  const FederateInfo& fi):
     Federate(fedName, core, fi)
 {
-    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(), this, getID());
+    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(),
+                                                         this,
+                                                         getID(),
+                                                         singleThreadFederate);
 }
 
 MessageFederate::MessageFederate(std::string_view fedName, CoreApp& core, const FederateInfo& fi):
     Federate(fedName, core, fi)
 {
-    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(), this, getID());
+    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(),
+                                                         this,
+                                                         getID(),
+                                                         singleThreadFederate);
 }
 
 MessageFederate::MessageFederate(std::string_view fedName, const std::string& configString):
     Federate(fedName, loadFederateInfo(configString))
 {
-    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(), this, getID());
+    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(),
+                                                         this,
+                                                         getID(),
+                                                         singleThreadFederate);
     if (looksLikeFile(configString)) {
         MessageFederate::registerInterfaces(configString);
     }
@@ -65,7 +77,10 @@ MessageFederate::MessageFederate(bool /*unused*/)
 {  // this constructor should only be called by child class that has already constructed the
    // underlying federate in
     // a virtual inheritance
-    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(), this, getID());
+    mfManager = std::make_unique<MessageFederateManager>(coreObject.get(),
+                                                         this,
+                                                         getID(),
+                                                         singleThreadFederate);
 }
 MessageFederate::MessageFederate(MessageFederate&&) noexcept = default;
 
diff --git a/src/helics/application_api/MessageFederateManager.cpp b/src/helics/application_api/MessageFederateManager.cpp
index 280dcaa9c4..170d2c7214 100644
--- a/src/helics/application_api/MessageFederateManager.cpp
+++ b/src/helics/application_api/MessageFederateManager.cpp
@@ -17,9 +17,11 @@ SPDX-License-Identifier: BSD-3-Clause
 namespace helics {
 MessageFederateManager::MessageFederateManager(Core* coreOb,
                                                MessageFederate* fed,
-                                               LocalFederateId id):
-    coreObject(coreOb),
-    mFed(fed), fedID(id)
+                                               LocalFederateId id,
+                                               bool singleThreaded):
+    mLocalEndpoints(!singleThreaded),
+    coreObject(coreOb), mFed(fed), fedID(id), eptData(!singleThreaded),
+    messageOrder(!singleThreaded)
 {
 }
 MessageFederateManager::~MessageFederateManager() = default;
@@ -36,7 +38,7 @@ Endpoint& MessageFederateManager::registerEndpoint(std::string_view name, std::s
 {
     auto handle = coreObject->registerEndpoint(fedID, name, type);
     if (handle.isValid()) {
-        auto eptHandle = local_endpoints.lock();
+        auto eptHandle = mLocalEndpoints.lock();
         auto loc = eptHandle->insert(name, handle, mFed, name, handle);
         if (loc) {
             auto& ref = eptHandle->back();
@@ -59,7 +61,7 @@ Endpoint& MessageFederateManager::registerTargetedEndpoint(std::string_view name
 {
     auto handle = coreObject->registerTargetedEndpoint(fedID, name, type);
     if (handle.isValid()) {
-        auto eptHandle = local_endpoints.lock();
+        auto eptHandle = mLocalEndpoints.lock();
         auto loc = eptHandle->insert(name, handle, mFed, name, handle);
         if (loc) {
             auto& ref = eptHandle->back();
@@ -157,7 +159,7 @@ void MessageFederateManager::updateTime(Time newTime, Time /*oldTime*/)
         return;
     }
     InterfaceHandle endpoint_id;
-    auto epts = local_endpoints.lock();
+    auto epts = mLocalEndpoints.lock();
     auto mcall = allCallback.load();
     for (size_t ii = 0; ii < epCount; ++ii) {
         auto message = coreObject->receiveAny(fedID, endpoint_id);
@@ -178,11 +180,11 @@ void MessageFederateManager::updateTime(Time newTime, Time /*oldTime*/)
                 // need to be copied otherwise there is a potential race condition on lock removal
                 epts.unlock();
                 eData->callback(currentEpt, CurrentTime);
-                epts = local_endpoints.lock();
+                epts = mLocalEndpoints.lock();
             } else if (mcall) {
                 epts.unlock();
                 mcall(currentEpt, CurrentTime);
-                epts = local_endpoints.lock();
+                epts = mLocalEndpoints.lock();
             }
         }
     }
@@ -201,7 +203,7 @@ std::string MessageFederateManager::localQuery(std::string_view queryStr) const
     std::string ret;
     if (queryStr == "endpoints") {
         ret = generateStringVector_if(
-            local_endpoints.lock_shared(),
+            mLocalEndpoints.lock_shared(),
             [](const auto& info) { return info.getName(); },
             [](const auto& info) { return (!info.getName().empty()); });
     }
@@ -213,20 +215,20 @@ static Endpoint invalidEptNC{};
 
 Endpoint& MessageFederateManager::getEndpoint(std::string_view name)
 {
-    auto sharedEpt = local_endpoints.lock();
+    auto sharedEpt = mLocalEndpoints.lock();
     auto ept = sharedEpt->find(name);
     return (ept != sharedEpt.end()) ? (*ept) : invalidEptNC;
 }
 const Endpoint& MessageFederateManager::getEndpoint(std::string_view name) const
 {
-    auto sharedEpt = local_endpoints.lock_shared();
+    auto sharedEpt = mLocalEndpoints.lock_shared();
     auto ept = sharedEpt->find(name);
     return (ept != sharedEpt.end()) ? (*ept) : invalidEpt;
 }
 
 Endpoint& MessageFederateManager::getEndpoint(int index)
 {
-    auto sharedEpt = local_endpoints.lock();
+    auto sharedEpt = mLocalEndpoints.lock();
     if (isValidIndex(index, *sharedEpt)) {
         return (*sharedEpt)[index];
     }
@@ -234,7 +236,7 @@ Endpoint& MessageFederateManager::getEndpoint(int index)
 }
 const Endpoint& MessageFederateManager::getEndpoint(int index) const
 {
-    auto sharedEpt = local_endpoints.lock_shared();
+    auto sharedEpt = mLocalEndpoints.lock_shared();
     if (isValidIndex(index, *sharedEpt)) {
         return (*sharedEpt)[index];
     }
@@ -243,7 +245,7 @@ const Endpoint& MessageFederateManager::getEndpoint(int index) const
 
 int MessageFederateManager::getEndpointCount() const
 {
-    return static_cast<int>(local_endpoints.lock_shared()->size());
+    return static_cast<int>(mLocalEndpoints.lock_shared()->size());
 }
 
 void MessageFederateManager::setEndpointNotificationCallback(
diff --git a/src/helics/application_api/MessageFederateManager.hpp b/src/helics/application_api/MessageFederateManager.hpp
index 676a3fe73d..7419c66a12 100644
--- a/src/helics/application_api/MessageFederateManager.hpp
+++ b/src/helics/application_api/MessageFederateManager.hpp
@@ -35,7 +35,10 @@ class MessageFederateManager {
   public:
     /** construct from a pointer to a core and a specified federate id
      */
-    MessageFederateManager(Core* coreOb, MessageFederate* mFed, LocalFederateId id);
+    MessageFederateManager(Core* coreOb,
+                           MessageFederate* mFed,
+                           LocalFederateId id,
+                           bool singleThreaded);
     ~MessageFederateManager();
     /** register an endpoint
     @details call is only valid in startup mode
@@ -116,17 +119,19 @@ class MessageFederateManager {
         gmlc::containers::SimpleQueue<std::unique_ptr<Message>> messages;
         std::function<void(Endpoint&, Time)> callback;
     };
-    shared_guarded<gmlc::containers::DualStringMappedVector<Endpoint, InterfaceHandle>>
-        local_endpoints;  //!< storage for the local endpoint information
+    /// storage for the local endpoint information
+    shared_guarded_opt<gmlc::containers::DualStringMappedVector<Endpoint, InterfaceHandle>>
+        mLocalEndpoints;
     atomic_guarded<std::function<void(Endpoint&, Time)>> allCallback;
     Time CurrentTime = Time::minVal();  //!< the current simulation time
     Core* coreObject;  //!< the pointer to the actual core
     MessageFederate* mFed;  //!< pointer back to the message Federate
     const LocalFederateId fedID;  //!< storage for the federate ID
     /// the storage for the message queues and other unique Endpoint information
-    shared_guarded<std::deque<EndpointData>> eptData;
-    guarded<std::vector<unsigned int>>
-        messageOrder;  //!< maintaining a list of the ordered messages
+    shared_guarded_opt<std::deque<EndpointData>> eptData;
+    /// maintaining a list of the ordered messages
+    guarded_opt<std::vector<unsigned int>> messageOrder;
+
   private:
     void removeOrderedMessage(unsigned int index);
 };
diff --git a/src/helics/application_api/ValueFederate.cpp b/src/helics/application_api/ValueFederate.cpp
index b0785333ea..1292a069d4 100644
--- a/src/helics/application_api/ValueFederate.cpp
+++ b/src/helics/application_api/ValueFederate.cpp
@@ -29,7 +29,10 @@ ValueFederate::ValueFederate(std::string_view fedName, const FederateInfo& fi):
     Federate(fedName, fi)
 {
     // the core object get instantiated in the Federate constructor
-    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(), this, getID());
+    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(),
+                                                       this,
+                                                       getID(),
+                                                       singleThreadFederate);
     vfManager->useJsonSerialization = fi.useJsonSerialization;
 }
 ValueFederate::ValueFederate(std::string_view fedName,
@@ -37,21 +40,30 @@ ValueFederate::ValueFederate(std::string_view fedName,
                              const FederateInfo& fi):
     Federate(fedName, core, fi)
 {
-    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(), this, getID());
+    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(),
+                                                       this,
+                                                       getID(),
+                                                       singleThreadFederate);
     vfManager->useJsonSerialization = fi.useJsonSerialization;
 }
 
 ValueFederate::ValueFederate(std::string_view fedName, CoreApp& core, const FederateInfo& fi):
     Federate(fedName, core, fi)
 {
-    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(), this, getID());
+    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(),
+                                                       this,
+                                                       getID(),
+                                                       singleThreadFederate);
     vfManager->useJsonSerialization = fi.useJsonSerialization;
 }
 
 ValueFederate::ValueFederate(std::string_view fedName, const std::string& configString):
     Federate(fedName, loadFederateInfo(configString))
 {
-    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(), this, getID());
+    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(),
+                                                       this,
+                                                       getID(),
+                                                       singleThreadFederate);
     vfManager->useJsonSerialization = useJsonSerialization;
     if (looksLikeFile(configString)) {
         ValueFederate::registerInterfaces(configString);
@@ -72,7 +84,10 @@ ValueFederate::ValueFederate() = default;
 
 ValueFederate::ValueFederate(bool /*res*/)
 {
-    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(), this, getID());
+    vfManager = std::make_unique<ValueFederateManager>(coreObject.get(),
+                                                       this,
+                                                       getID(),
+                                                       singleThreadFederate);
     vfManager->useJsonSerialization = useJsonSerialization;
 }
 
diff --git a/src/helics/application_api/ValueFederateManager.cpp b/src/helics/application_api/ValueFederateManager.cpp
index 3d6cae56ef..254145461a 100644
--- a/src/helics/application_api/ValueFederateManager.cpp
+++ b/src/helics/application_api/ValueFederateManager.cpp
@@ -16,8 +16,13 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <utility>
 namespace helics {
-ValueFederateManager::ValueFederateManager(Core* coreOb, ValueFederate* vfed, LocalFederateId id):
-    fedID(id), coreObject(coreOb), fed(vfed)
+ValueFederateManager::ValueFederateManager(Core* coreOb,
+                                           ValueFederate* vfed,
+                                           LocalFederateId id,
+                                           bool singleThreaded):
+    fedID(id),
+    inputs(!singleThreaded), publications(!singleThreaded), coreObject(coreOb), fed(vfed),
+    inputData(!singleThreaded), targetIDs(!singleThreaded), inputTargets(!singleThreaded)
 {
 }
 ValueFederateManager::~ValueFederateManager() = default;
diff --git a/src/helics/application_api/ValueFederateManager.hpp b/src/helics/application_api/ValueFederateManager.hpp
index 49c02e0326..2d5ad5b099 100644
--- a/src/helics/application_api/ValueFederateManager.hpp
+++ b/src/helics/application_api/ValueFederateManager.hpp
@@ -63,7 +63,10 @@ struct InputData {
 /** class handling the implementation details of a value Federate*/
 class ValueFederateManager {
   public:
-    ValueFederateManager(Core* coreOb, ValueFederate* vfed, LocalFederateId id);
+    ValueFederateManager(Core* coreOb,
+                         ValueFederate* vfed,
+                         LocalFederateId id,
+                         bool singleThreaded);
     ~ValueFederateManager();
 
     Publication&
@@ -206,8 +209,8 @@ class ValueFederateManager {
     bool useJsonSerialization{false};  //!< all outgoing data should be serialized as JSON
   private:
     LocalFederateId fedID;  //!< the federation ID from the core API
-    shared_guarded_m<gmlc::containers::DualStringMappedVector<Input, InterfaceHandle>> inputs;
-    shared_guarded_m<gmlc::containers::DualStringMappedVector<Publication, InterfaceHandle>>
+    shared_guarded_m_opt<gmlc::containers::DualStringMappedVector<Input, InterfaceHandle>> inputs;
+    shared_guarded_m_opt<gmlc::containers::DualStringMappedVector<Publication, InterfaceHandle>>
         publications;
     Time CurrentTime{-1.0};  //!< the current simulation time
     Core* coreObject{nullptr};  //!< the pointer to the actual core
@@ -216,11 +219,11 @@ class ValueFederateManager {
     /// the global callback function
     atomic_guarded<std::function<void(Input&, Time)>> allCallback;
     /// the storage for the message queues and other unique Endpoint information
-    shared_guarded<std::deque<InputData>> inputData;
+    shared_guarded_opt<std::deque<InputData>> inputData;
     /// container for the target identifications
-    shared_guarded<std::multimap<std::string, InterfaceHandle>> targetIDs;
+    shared_guarded_opt<std::multimap<std::string, InterfaceHandle>> targetIDs;
     /// container for the specified input targets
-    shared_guarded<std::multimap<InterfaceHandle, std::string>> inputTargets;
+    shared_guarded_opt<std::multimap<InterfaceHandle, std::string>> inputTargets;
 
   private:
     void getUpdateFromCore(InterfaceHandle handle);
diff --git a/src/helics/common/GuardedTypes.hpp b/src/helics/common/GuardedTypes.hpp
index 91ac1970e8..8c0f366ae9 100644
--- a/src/helics/common/GuardedTypes.hpp
+++ b/src/helics/common/GuardedTypes.hpp
@@ -8,24 +8,36 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include "gmlc/libguarded/atomic_guarded.hpp"
 #include "gmlc/libguarded/guarded.hpp"
+#include "gmlc/libguarded/guarded_opt.hpp"
 #include "gmlc/libguarded/ordered_guarded.hpp"
 #include "gmlc/libguarded/shared_guarded.hpp"
+#include "gmlc/libguarded/shared_guarded_opt.hpp"
+
 //#include "gmlc/libguarded/staged_guarded.hpp"
 
 template<class T>
 using guarded = gmlc::libguarded::guarded<T>;
 
+template<class T>
+using guarded_opt = gmlc::libguarded::guarded_opt<T>;
+
 template<class T>
 using atomic_guarded = gmlc::libguarded::atomic_guarded<T>;
 
 template<class T>
 using shared_guarded_m = gmlc::libguarded::shared_guarded<T, std::mutex>;
 
+template<class T>
+using shared_guarded_m_opt = gmlc::libguarded::shared_guarded_opt<T, std::mutex>;
+
 template<class T>
 using ordered_guarded_m = gmlc::libguarded::ordered_guarded<T, std::mutex>;
 
 template<class T>
 using shared_guarded = gmlc::libguarded::shared_guarded<T, std::shared_mutex>;
 
+template<class T>
+using shared_guarded_opt = gmlc::libguarded::shared_guarded_opt<T, std::shared_mutex>;
+
 template<class T>
 using ordered_guarded = gmlc::libguarded::ordered_guarded<T, std::shared_mutex>;
diff --git a/src/helics/core/CommonCore.cpp b/src/helics/core/CommonCore.cpp
index eda0ca103e..caaad02dce 100644
--- a/src/helics/core/CommonCore.cpp
+++ b/src/helics/core/CommonCore.cpp
@@ -4282,8 +4282,7 @@ void CommonCore::processQueryResponse(const ActionMessage& m)
             }
             if (requestors.back().dest_id == global_broker_id_local ||
                 requestors.back().dest_id == gDirectCoreId) {
-                // TODO(PT) make setDelayedValue have move set function
-                activeQueries.setDelayedValue(requestors.back().messageID, str);
+                activeQueries.setDelayedValue(requestors.back().messageID, std::move(str));
             } else {
                 requestors.back().payload = std::move(str);
                 routeMessage(std::move(requestors.back()));
@@ -4869,8 +4868,7 @@ void CommonCore::processQueryCommand(ActionMessage& cmd)
                 std::string repStr = coreQuery(cmd.payload.to_string(), force_ordered);
                 if (repStr != "#wait") {
                     if (cmd.source_id == gDirectCoreId) {
-                        // TODO(PT) make setDelayedValue have a move method
-                        activeQueries.setDelayedValue(cmd.messageID, repStr);
+                        activeQueries.setDelayedValue(cmd.messageID, std::move(repStr));
                     } else {
                         ActionMessage queryResp(force_ordered ? CMD_QUERY_REPLY_ORDERED :
                                                                 CMD_QUERY_REPLY);
@@ -5176,8 +5174,7 @@ void CommonCore::checkInFlightQueriesForDisconnect()
                 }
             }
             if (requestors.back().dest_id == global_broker_id_local) {
-                // TODO(PT) add rvalue reference method
-                activeQueries.setDelayedValue(requestors.back().messageID, str);
+                activeQueries.setDelayedValue(requestors.back().messageID, std::move(str));
             } else {
                 requestors.back().payload = std::move(str);
                 routeMessage(std::move(requestors.back()));
diff --git a/src/helics/core/CoreBroker.cpp b/src/helics/core/CoreBroker.cpp
index 88dc024074..e5acd9f18a 100644
--- a/src/helics/core/CoreBroker.cpp
+++ b/src/helics/core/CoreBroker.cpp
@@ -3021,8 +3021,7 @@ void CoreBroker::checkInFlightQueries(GlobalBrokerId brkid)
                 }
             }
             if (requestors.back().dest_id == global_broker_id_local) {
-                // TODO(PT) add rvalue reference method
-                activeQueries.setDelayedValue(requestors.back().messageID, str);
+                activeQueries.setDelayedValue(requestors.back().messageID, std::move(str));
             } else {
                 requestors.back().payload = std::move(str);
                 routeMessage(std::move(requestors.back()));
@@ -3976,8 +3975,7 @@ void CoreBroker::processQueryResponse(const ActionMessage& m)
                 }
             }
             if (requestors.back().dest_id == global_broker_id_local) {
-                // TODO(PT) add rvalue reference method
-                activeQueries.setDelayedValue(requestors.back().messageID, str);
+                activeQueries.setDelayedValue(requestors.back().messageID, std::move(str));
             } else {
                 requestors.back().payload = std::move(str);
                 routeMessage(std::move(requestors.back()));
diff --git a/src/helics/core/CoreTypes.hpp b/src/helics/core/CoreTypes.hpp
index b47ac313f2..a582f5f2c0 100644
--- a/src/helics/core/CoreTypes.hpp
+++ b/src/helics/core/CoreTypes.hpp
@@ -29,6 +29,16 @@ enum class FederateStates : std::uint8_t {
     UNKNOWN,  //!< unknown state
 };
 
+/** enumeration of the threading options for a core*/
+enum class CoreThreading : std::uint8_t {
+    /** choose the default based on federate options*/
+    DEFAULT = HELICS_CORE_TYPE_DEFAULT,
+    /** specify the core should be multithreaded*/
+    MULTI = HELICS_FLAG_MULTI_THREAD_CORE,
+    /** specify a single threaded core*/
+    SINGLE = HELICS_FLAG_SINGLE_THREAD_CORE
+};
+
 /** convert the state into a human readable string*/
 const std::string& fedStateString(FederateStates state);
 
diff --git a/src/helics/core/helics_definitions.hpp b/src/helics/core/helics_definitions.hpp
index 6cb3f5e46f..74f5131b5d 100644
--- a/src/helics/core/helics_definitions.hpp
+++ b/src/helics/core/helics_definitions.hpp
@@ -95,6 +95,10 @@ namespace defs {
         /** flag indicating that the federate/core/broker should *NOT* allow remote commands
            affecting operations*/
         DISABLE_REMOTE_CONTROL = HELICS_FLAG_DISABLE_REMOTE_CONTROL,
+        /** flag indicating that a federate should use json serialization*/
+        USE_JSON_SERIALIZATION = HELICS_FLAG_USE_JSON_SERIALIZATION,
+        /** flag indicating that a federate should have an automated time request*/
+        AUTOMATED_TIME_REQUEST = HELICS_FLAG_AUTOMATED_TIME_REQUEST
     };
     /** potential errors that might be generated by a helics federate/core/broker */
     enum Errors : int32_t {
@@ -137,6 +141,7 @@ namespace defs {
         OUTPUT_DELAY = HELICS_PROPERTY_TIME_OUTPUT_DELAY,
         MAX_ITERATIONS = HELICS_PROPERTY_INT_MAX_ITERATIONS,
         LOG_LEVEL = HELICS_PROPERTY_INT_LOG_LEVEL,
+        STOPTIME = HELICS_PROPERTY_TIME_STOPTIME,
         FILE_LOG_LEVEL = HELICS_PROPERTY_INT_FILE_LOG_LEVEL,
         CONSOLE_LOG_LEVEL = HELICS_PROPERTY_INT_CONSOLE_LOG_LEVEL,
         LOG_BUFFER = HELICS_PROPERTY_INT_LOG_BUFFER,
diff --git a/src/helics/helics_enums.h b/src/helics/helics_enums.h
index a11594f1c8..0bf99a8556 100644
--- a/src/helics/helics_enums.h
+++ b/src/helics/helics_enums.h
@@ -128,6 +128,10 @@ typedef enum { /* NOLINT */
                HELICS_FLAG_REALTIME = 16,
                /** flag indicating that the federate will only interact on a single thread*/
                HELICS_FLAG_SINGLE_THREAD_FEDERATE = 27,
+               /** flag indicating use of a thread safe core*/
+               HELICS_FLAG_MULTI_THREAD_CORE = 28,
+               /** flag indicating use of a single threaded core*/
+               HELICS_FLAG_SINGLE_THREAD_CORE = 29,
                /** used to not display warnings on mismatched requested times*/
                HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS = 67,
                /** specify that checking on configuration files should be strict and throw and error
@@ -146,7 +150,7 @@ typedef enum { /* NOLINT */
                HELICS_FLAG_CALLBACK_FEDERATE = 103,
                /** specify that a federate should automatically call timeRequest on completion of
                   current request*/
-               HELICS_FLAG_AUTOMATED_TIMEREQUEST = 106
+               HELICS_FLAG_AUTOMATED_TIME_REQUEST = 106
 } HelicsFederateFlags;
 
 /** enumeration of additional core flags*/
@@ -283,8 +287,8 @@ typedef enum { /* NOLINT */
                HELICS_PROPERTY_TIME_INPUT_DELAY = 148,
                /** the property controlling output delay for a federate*/
                HELICS_PROPERTY_TIME_OUTPUT_DELAY = 150,
-               /** specify the maximum time of a federate (callback federates only)*/
-               HELICS_PROPERTY_TIME_MAXTIME = 152,
+               /** specify the maximum time of a federate */
+               HELICS_PROPERTY_TIME_STOPTIME = 152,
                /** the property specifying a timeout to trigger actions if the time for granting
                   exceeds a certain threshold*/
                HELICS_PROPERTY_TIME_GRANT_TIMEOUT = 161,
diff --git a/src/helics/shared_api_library/CMakeLists.txt b/src/helics/shared_api_library/CMakeLists.txt
index 945bc12218..1ae211feb3 100644
--- a/src/helics/shared_api_library/CMakeLists.txt
+++ b/src/helics/shared_api_library/CMakeLists.txt
@@ -51,6 +51,35 @@ if(Python_EXECUTABLE)
                 ../helics_enums.h
     )
 
+    # this section is for developer convenience to make sure the backup files get copied over when
+    # working on the C API
+    if(HELICS_OVERWRITE_BACKUP_H_FILES)
+        add_custom_target(
+            overwrite_backup_files ALL
+            DEPENDS ${PROJECT_BINARY_DIR}/helics_generated_includes/helics/helics.h
+                    ${PROJECT_BINARY_DIR}/helics_generated_includes/helics/helics_api.h
+        )
+        add_custom_command(
+            TARGET overwrite_backup_files
+            POST_BUILD
+            COMMAND
+                ${CMAKE_COMMAND} -E copy
+                ${PROJECT_BINARY_DIR}/helics_generated_includes/helics/helics.h
+                ${PROJECT_SOURCE_DIR}/src/helics/shared_api_library/backup/helics DEPENDS
+                ${PROJECT_BINARY_DIR}/helics_generated_includes/helics/helics.h
+        )
+        add_custom_command(
+            TARGET overwrite_backup_files
+            POST_BUILD
+            COMMAND
+                ${CMAKE_COMMAND} -E copy
+                ${PROJECT_BINARY_DIR}/helics_generated_includes/helics/helics_api.h
+                ${PROJECT_SOURCE_DIR}/src/helics/shared_api_library/backup/helics DEPENDS
+                ${PROJECT_BINARY_DIR}/helics_generated_includes/helics/helics_api.h
+        )
+
+        set_target_properties(overwrite_backup_files PROPERTIES FOLDER interfaces)
+    endif()
 else()
     configure_file(
         ${PROJECT_SOURCE_DIR}/src/helics/shared_api_library/backup/helics/helics.h
diff --git a/src/helics/shared_api_library/backup/helics/helics.h b/src/helics/shared_api_library/backup/helics/helics.h
index 3415c6f740..702da198fc 100644
--- a/src/helics/shared_api_library/backup/helics/helics.h
+++ b/src/helics/shared_api_library/backup/helics/helics.h
@@ -154,6 +154,10 @@ typedef enum { /* NOLINT */
                HELICS_FLAG_REALTIME = 16,
                /** flag indicating that the federate will only interact on a single thread*/
                HELICS_FLAG_SINGLE_THREAD_FEDERATE = 27,
+               /** flag indicating use of a thread safe core*/
+               HELICS_FLAG_MULTI_THREAD_CORE = 28,
+               /** flag indicating use of a single threaded core*/
+               HELICS_FLAG_SINGLE_THREAD_CORE = 29,
                /** used to not display warnings on mismatched requested times*/
                HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS = 67,
                /** specify that checking on configuration files should be strict and throw and error
@@ -172,7 +176,7 @@ typedef enum { /* NOLINT */
                HELICS_FLAG_CALLBACK_FEDERATE = 103,
                /** specify that a federate should automatically call timeRequest on completion of
                   current request*/
-               HELICS_FLAG_AUTOMATED_TIMEREQUEST = 106
+               HELICS_FLAG_AUTOMATED_TIME_REQUEST = 106
 } HelicsFederateFlags;
 
 /** enumeration of additional core flags*/
@@ -206,7 +210,13 @@ typedef enum { /* NOLINT */
                /** specify that helics should capture profiling data*/
                HELICS_FLAG_PROFILING = 93,
                /** flag trigger for generating a profiling marker*/
-               HELICS_FLAG_PROFILING_MARKER = 95
+               HELICS_FLAG_PROFILING_MARKER = 95,
+               /** specify that the federate/core/broker should allow some remote control operations
+                  such as finalize*/
+               HELICS_FLAG_ALLOW_REMOTE_CONTROL = 109,
+               /** specify that the federate/core/broker should *NOT* allow some remote control
+                  operations such as finalize*/
+               HELICS_FLAG_DISABLE_REMOTE_CONTROL = 110
 } HelicsFlags;
 
 /** log level definitions
@@ -303,8 +313,8 @@ typedef enum { /* NOLINT */
                HELICS_PROPERTY_TIME_INPUT_DELAY = 148,
                /** the property controlling output delay for a federate*/
                HELICS_PROPERTY_TIME_OUTPUT_DELAY = 150,
-               /** specify the maximum time of a federate (callback federates only)*/
-               HELICS_PROPERTY_TIME_MAXTIME = 152,
+               /** specify the maximum time of a federate */
+               HELICS_PROPERTY_TIME_STOPTIME = 152,
                /** the property specifying a timeout to trigger actions if the time for granting
                   exceeds a certain threshold*/
                HELICS_PROPERTY_TIME_GRANT_TIMEOUT = 161,
diff --git a/src/helics/shared_api_library/backup/helics/helics_api.h b/src/helics/shared_api_library/backup/helics/helics_api.h
index 5446dfceb6..563ae7a6df 100644
--- a/src/helics/shared_api_library/backup/helics/helics_api.h
+++ b/src/helics/shared_api_library/backup/helics/helics_api.h
@@ -60,13 +60,15 @@ typedef enum {
     HELICS_FLAG_FORWARD_COMPUTE = 14,
     HELICS_FLAG_REALTIME = 16,
     HELICS_FLAG_SINGLE_THREAD_FEDERATE = 27,
+    HELICS_FLAG_MULTI_THREAD_CORE = 28,
+    HELICS_FLAG_SINGLE_THREAD_CORE = 29,
     HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS = 67,
     HELICS_FLAG_STRICT_CONFIG_CHECKING = 75,
     HELICS_FLAG_USE_JSON_SERIALIZATION = 79,
     HELICS_FLAG_EVENT_TRIGGERED = 81,
     HELICS_FLAG_LOCAL_PROFILING_CAPTURE = 96,
     HELICS_FLAG_CALLBACK_FEDERATE = 103,
-    HELICS_FLAG_AUTOMATED_TIMEREQUEST = 106
+    HELICS_FLAG_AUTOMATED_TIME_REQUEST = 106
 } HelicsFederateFlags;
 
 typedef enum {
@@ -84,7 +86,9 @@ typedef enum {
     HELICS_FLAG_FORCE_LOGGING_FLUSH = 88,
     HELICS_FLAG_DUMPLOG = 89,
     HELICS_FLAG_PROFILING = 93,
-    HELICS_FLAG_PROFILING_MARKER = 95
+    HELICS_FLAG_PROFILING_MARKER = 95,
+    HELICS_FLAG_ALLOW_REMOTE_CONTROL = 109,
+    HELICS_FLAG_DISABLE_REMOTE_CONTROL = 110
 } HelicsFlags;
 
 typedef enum {
@@ -137,7 +141,7 @@ typedef enum {
     HELICS_PROPERTY_TIME_RT_TOLERANCE = 145,
     HELICS_PROPERTY_TIME_INPUT_DELAY = 148,
     HELICS_PROPERTY_TIME_OUTPUT_DELAY = 150,
-    HELICS_PROPERTY_TIME_MAXTIME = 152,
+    HELICS_PROPERTY_TIME_STOPTIME = 152,
     HELICS_PROPERTY_TIME_GRANT_TIMEOUT = 161,
     HELICS_PROPERTY_INT_MAX_ITERATIONS = 259,
     HELICS_PROPERTY_INT_LOG_LEVEL = 271,
diff --git a/tests/helics/application_api/CallbackFederateTests.cpp b/tests/helics/application_api/CallbackFederateTests.cpp
index 781ef07bfe..29c23afcab 100644
--- a/tests/helics/application_api/CallbackFederateTests.cpp
+++ b/tests/helics/application_api/CallbackFederateTests.cpp
@@ -114,7 +114,7 @@ TEST_F(callbackFed, timeStepsPeriodMax)
     auto vFed1 = GetFederateAs<helics::CallbackFederate>(0);
     int cb1{0};
     int cb2{0};
-    vFed1->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 3.0);
+    vFed1->setProperty(HELICS_PROPERTY_TIME_STOPTIME, 3.0);
     vFed1->setProperty(HELICS_PROPERTY_TIME_PERIOD, 1.0);
     vFed1->setTimeRequestReturnCallback([&cb1](auto /*unused*/, bool /*unused*/) { ++cb1; });
     vFed1->setTimeRequestEntryCallback(
@@ -249,9 +249,9 @@ TEST_F(callbackFed, timeSteps2Fed)
     SetupTest<helics::CallbackFederate>("test", 2);
     auto vFed1 = GetFederateAs<helics::CallbackFederate>(0);
     auto vFed2 = GetFederateAs<helics::CallbackFederate>(1);
-    vFed1->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 3.0);
+    vFed1->setProperty(HELICS_PROPERTY_TIME_STOPTIME, 3.0);
     vFed1->setProperty(HELICS_PROPERTY_TIME_PERIOD, 1.0);
-    vFed2->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 3.0);
+    vFed2->setProperty(HELICS_PROPERTY_TIME_STOPTIME, 3.0);
     vFed2->setProperty(HELICS_PROPERTY_TIME_PERIOD, 1.0);
     auto& p1 = vFed1->registerGlobalPublication<double>("pub1");
     auto& p2 = vFed2->registerGlobalPublication<double>("pub2");
@@ -308,7 +308,7 @@ TEST_F(callbackFed, 100Fed_nosan)
     std::vector<double> vals(100);
     for (int ii = 0; ii < fedCount; ++ii) {
         auto fed = GetFederateAs<helics::CallbackFederate>(ii);
-        fed->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 120.0);
+        fed->setProperty(HELICS_PROPERTY_TIME_STOPTIME, 120.0);
         fed->setProperty(HELICS_PROPERTY_TIME_PERIOD, 1.0);
         fed->registerPublication<double>("p1");
         auto& s1 = fed->registerSubscription(std::string("fed") +
@@ -337,7 +337,7 @@ TEST_F(callbackFed, 1000Fed_ci_skip_nosan)
     std::vector<double> vals(fedCount);
     for (int ii = 0; ii < fedCount; ++ii) {
         auto fed = GetFederateAs<helics::CallbackFederate>(ii);
-        fed->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 25.0);
+        fed->setProperty(HELICS_PROPERTY_TIME_STOPTIME, 25.0);
         fed->setProperty(HELICS_PROPERTY_TIME_PERIOD, 1.0);
         fed->registerPublication<double>("p1");
         auto& s1 = fed->registerSubscription(
@@ -362,8 +362,8 @@ TEST_F(callbackFed, timeSteps2FedIterruption)
     SetupTest<helics::CallbackFederate>("test", 2);
     auto vFed1 = GetFederateAs<helics::CallbackFederate>(0);
     auto vFed2 = GetFederateAs<helics::CallbackFederate>(1);
-    vFed1->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 18.0);
-    vFed2->setProperty(HELICS_PROPERTY_TIME_MAXTIME, 18.0);
+    vFed1->setProperty(HELICS_PROPERTY_TIME_STOPTIME, 18.0);
+    vFed2->setProperty(HELICS_PROPERTY_TIME_STOPTIME, 18.0);
     auto& p1 = vFed1->registerGlobalPublication<double>("pub1");
     auto& p2 = vFed2->registerGlobalPublication<double>("pub2");
     auto& s1 = vFed1->registerSubscription("pub2");
diff --git a/tests/helics/application_api/FederateTests.cpp b/tests/helics/application_api/FederateTests.cpp
index 3c166f6efb..db7249302a 100644
--- a/tests/helics/application_api/FederateTests.cpp
+++ b/tests/helics/application_api/FederateTests.cpp
@@ -26,7 +26,7 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #define CORE_TYPE_TO_TEST helics::CoreType::TEST
 
-TEST(federate_tests, federate_initialize_tests)
+TEST(federate, federate_initialize_tests)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
     fi.coreInitString = "--autobroker";
@@ -55,6 +55,29 @@ TEST(federate_tests, federate_initialize_tests)
     Fed = nullptr;  // force the destructor
 }
 
+TEST(federate, single_core_federate)
+{
+    helics::FederateInfo fi(CORE_TYPE_TO_TEST);
+    fi.coreInitString = "--autobroker";
+    fi.setFlagOption(helics::defs::SINGLE_THREAD_FEDERATE);
+    auto fed = std::make_shared<helics::Federate>("test1", fi);
+
+    auto core = fed->getCorePointer();
+    ASSERT_TRUE((core));
+
+    auto name = std::string(core->getFederateName(fed->getID()));
+
+    EXPECT_EQ(name, fed->getName());
+    EXPECT_TRUE(fed->getCurrentMode() == helics::Federate::Modes::STARTUP);
+    fed->enterInitializingMode();
+    EXPECT_TRUE(fed->getCurrentMode() == helics::Federate::Modes::INITIALIZING);
+    fed->enterExecutingMode();
+    EXPECT_TRUE(fed->getCurrentMode() == helics::Federate::Modes::EXECUTING);
+
+    EXPECT_TRUE(fed->getFlagOption(helics::defs::SINGLE_THREAD_FEDERATE));
+    fed = nullptr;  // force the destructor
+}
+
 TEST(federate_tests, federate_initialize_iterate)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
@@ -154,7 +177,7 @@ TEST(federate_tests, federate_initialize_iteration_multiple)
 
 #endif
 
-TEST(federate_tests, federate_initialize_tests_env)
+TEST(federate, federate_initialize_tests_env)
 {
     setEnvironmentVariable("HELICS_LOG_LEVEL", "connections");
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
@@ -180,7 +203,7 @@ TEST(federate_tests, federate_initialize_tests_env)
     Fed = nullptr;  // force the destructor
 }
 /*  re-enable this test once log levels support numerical values again
-TEST(federate_tests, federate_initialize_tests_env2)
+TEST(federate, federate_initialize_tests_env2)
 {
     setEnvironmentVariable("HELICS_BROKER_LOG_LEVEL", std::to_string(HELICS_LOG_LEVEL_CONNECTIONS));
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
@@ -205,7 +228,7 @@ TEST(federate_tests, federate_initialize_tests_env2)
     Fed = nullptr;  // force the destructor
 }
 */
-TEST(federate_tests, time_step_tests)
+TEST(federate, time_step_tests)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
     fi.coreInitString = "--autobroker";
@@ -227,7 +250,7 @@ TEST(federate_tests, time_step_tests)
     EXPECT_EQ(res, 3.0);
 }
 
-TEST(federate_tests, broker_disconnect_test_ci_skip)
+TEST(federate, broker_disconnect_test_ci_skip)
 {
     auto brk = helics::BrokerFactory::create(CORE_TYPE_TO_TEST, "b1", "-f 1");
     brk->connect();
@@ -259,7 +282,7 @@ TEST(federate_tests, broker_disconnect_test_ci_skip)
     EXPECT_TRUE(Fed->getCurrentMode() == helics::Federate::Modes::FINISHED);
 }
 
-TEST(federate_tests, index_groups)
+TEST(federate, index_groups)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
     fi.coreInitString = "--autobroker";
@@ -283,7 +306,7 @@ TEST(federate_tests, index_groups)
 
 #ifdef HELICS_ENABLE_ZMQ_CORE
 // TODO(PT): make this work for all test types
-TEST(federate_tests, bad_broker_error_zmq_ci_skip)
+TEST(federate, bad_broker_error_zmq_ci_skip)
 {
     helics::FederateInfo fi(helics::CoreType::ZMQ);
     fi.coreInitString = "--broker=b1 --tick=200 --timeout=800 --networktimeout=400";
@@ -292,7 +315,7 @@ TEST(federate_tests, bad_broker_error_zmq_ci_skip)
                  helics::RegistrationFailure);
 }
 
-TEST(federate_tests, timeout_error_zmq_ci_skip_nosan)
+TEST(federate, timeout_error_zmq_ci_skip_nosan)
 {
     helics::FederateInfo fi(helics::CoreType::ZMQ);
     fi.coreInitString = "--tick=200 --timeout=800 --networktimeout=400";
@@ -301,7 +324,7 @@ TEST(federate_tests, timeout_error_zmq_ci_skip_nosan)
                  helics::RegistrationFailure);
 }
 
-TEST(federate_tests, timeout_abort_zmq_ci_skip_nosan_nocov)
+TEST(federate, timeout_abort_zmq_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
@@ -330,7 +353,7 @@ TEST(federate_tests, timeout_abort_zmq_ci_skip_nosan_nocov)
 #endif
 
 #ifdef HELICS_ENABLE_TCP_CORE
-TEST(federate_tests, timeout_abort_tcp_ci_skip_nosan_nocov)
+TEST(federate, timeout_abort_tcp_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
@@ -356,7 +379,7 @@ TEST(federate_tests, timeout_abort_tcp_ci_skip_nosan_nocov)
     }
 }
 
-TEST(federate_tests, timeout_abort_tcpss_ci_skip_nosan_nocov)
+TEST(federate, timeout_abort_tcpss_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
@@ -384,7 +407,7 @@ TEST(federate_tests, timeout_abort_tcpss_ci_skip_nosan_nocov)
 #endif
 
 #ifdef HELICS_ENABLE_UDP_CORE
-TEST(federate_tests, timeout_abort_udp_ci_skip_nosan_nocov)
+TEST(federate, timeout_abort_udp_ci_skip_nosan_nocov)
 {
     std::future<std::shared_ptr<helics::Federate>> fut;
     auto call = []() {
@@ -411,7 +434,7 @@ TEST(federate_tests, timeout_abort_udp_ci_skip_nosan_nocov)
 
 #endif
 
-TEST(federate_tests, federate_multiple_federates)
+TEST(federate, federate_multiple_federates)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
     fi.coreName = "core1-mult";
@@ -461,7 +484,7 @@ TEST(federate_tests, federate_multiple_federates)
 }
 
 /** the same as the previous test except with multiple cores and a single broker*/
-TEST(federate_tests, multiple_federates_multi_cores)
+TEST(federate, multiple_federates_multi_cores)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
     fi.coreName = "core_mc1";
@@ -509,7 +532,7 @@ TEST(federate_tests, multiple_federates_multi_cores)
     Fed2->finalize();
 }
 
-TEST(federate_tests, multiple_federates_async_calls)
+TEST(federate, multiple_federates_async_calls)
 {
     helics::FederateInfo fi(CORE_TYPE_TO_TEST);
     fi.coreName = "core_async";
@@ -567,7 +590,7 @@ TEST(federate_tests, multiple_federates_async_calls)
     Fed2->finalize();
 }
 
-TEST(federate_tests, missing_core)
+TEST(federate, missing_core)
 {
     helics::FederateInfo fi(helics::CoreType::NULLCORE);
     fi.coreName = "core_missing";
@@ -577,7 +600,7 @@ TEST(federate_tests, missing_core)
                  helics::HelicsException);
 }
 
-TEST(federate_tests, not_open)
+TEST(federate, not_open)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full";
@@ -591,7 +614,7 @@ TEST(federate_tests, not_open)
     Fed1->finalize();
 }
 
-TEST(federate_tests, coreApp)
+TEST(federate, coreApp)
 {
     helics::CoreApp capp(helics::CoreType::TEST, "corename", "-f 1 --autobroker");
     helics::FederateInfo fi(helics::CoreType::TEST);
@@ -601,7 +624,7 @@ TEST(federate_tests, coreApp)
     Fed1->finalize();
 }
 
-TEST(federate_tests, core_ptr)
+TEST(federate, core_ptr)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_ptr";
@@ -615,7 +638,7 @@ TEST(federate_tests, core_ptr)
     Fed1->finalize();
 }
 
-TEST(federate_tests, core_ptr_no_name)
+TEST(federate, core_ptr_no_name)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreInitString = "-f 1 --autobroker";
@@ -625,7 +648,7 @@ TEST(federate_tests, core_ptr_no_name)
     Fed1->finalize();
 }
 
-TEST(federate_tests, from_string)
+TEST(federate, from_string)
 {
     auto Fed1 = std::make_shared<helics::Federate>(
         "fed1", "--coretype=TEST --corename core_init --coreinitstring='-f 1 --autobroker'");
@@ -637,7 +660,7 @@ TEST(federate_tests, from_string)
     c1.reset();
 }
 
-TEST(federate_tests, from_file1)
+TEST(federate, from_file1)
 {
     auto fstr1 = std::string(TEST_DIR) + "example_filters.json";
     auto Fed1 = std::make_shared<helics::Federate>(fstr1);
@@ -645,7 +668,7 @@ TEST(federate_tests, from_file1)
     Fed1->finalize();
 }
 
-TEST(federate_tests, from_file3)
+TEST(federate, from_file3)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -656,7 +679,7 @@ TEST(federate_tests, from_file3)
     Fed1->getCorePointer()->disconnect();
 }
 
-TEST(federate_tests, from_file4)
+TEST(federate, from_file4)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -666,7 +689,7 @@ TEST(federate_tests, from_file4)
     Fed1->finalize();
 }
 
-TEST(federate_tests, from_file2)
+TEST(federate, from_file2)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -676,7 +699,7 @@ TEST(federate_tests, from_file2)
     Fed1->finalize();
 }
 
-TEST(federate_tests, from_file_invalid)
+TEST(federate, from_file_invalid)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -685,7 +708,7 @@ TEST(federate_tests, from_file_invalid)
     EXPECT_THROW(Fed1 = std::make_shared<helics::Federate>(fstr2), std::exception);
 }
 
-TEST(federate_tests, from_file5)
+TEST(federate, from_file5)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -693,7 +716,7 @@ TEST(federate_tests, from_file5)
     EXPECT_THROW(auto fed = std::make_shared<helics::Federate>(fstr2), helics::InvalidParameter);
 }
 
-TEST(federate_tests, from_file6)
+TEST(federate, from_file6)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -704,7 +727,7 @@ TEST(federate_tests, from_file6)
     EXPECT_THROW(Fed1->registerFilterInterfaces("non_existing.json"), helics::InvalidParameter);
 }
 
-TEST(federate_tests, from_file7)
+TEST(federate, from_file7)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -714,7 +737,7 @@ TEST(federate_tests, from_file7)
     Fed1->finalize();
 }
 
-TEST(federate_tests, from_file8)
+TEST(federate, from_file8)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -724,7 +747,7 @@ TEST(federate_tests, from_file8)
     Fed1->finalize();
 }
 
-TEST(federate_tests, from_file9)
+TEST(federate, from_file9)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -738,7 +761,7 @@ TEST(federate_tests, from_file9)
     helics::CoreFactory::terminateAllCores();
 }
 
-TEST(federate_tests, from_file10)
+TEST(federate, from_file10)
 {
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -754,7 +777,7 @@ TEST(federate_tests, from_file10)
     helics::CoreFactory::terminateAllCores();
 }
 
-TEST(federate_tests, from_string2)
+TEST(federate, from_string2)
 {
     auto Fed1 = std::make_shared<helics::Federate>(
         "--name=fed1 --coretype=TEST --corename core_init --coreinitstring='-f 1 --autobroker'");
@@ -764,7 +787,7 @@ TEST(federate_tests, from_string2)
     Fed1->finalize();
 }
 
-TEST(federate_tests, enterInit)
+TEST(federate, enterInit)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_a";
@@ -782,7 +805,7 @@ TEST(federate_tests, enterInit)
     EXPECT_NO_THROW(Fed1->finalize());
 }
 
-TEST(federate_tests, enterInitComplete)
+TEST(federate, enterInitComplete)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_b";
@@ -796,7 +819,7 @@ TEST(federate_tests, enterInitComplete)
     Fed1->finalize();
 }
 
-TEST(federate_tests, enterExec)
+TEST(federate, enterExec)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_c";
@@ -816,7 +839,7 @@ TEST(federate_tests, enterExec)
     Fed1->finalizeComplete();
 }
 
-TEST(federate_tests, enterExecAfterFinal)
+TEST(federate, enterExecAfterFinal)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_ec";
@@ -833,7 +856,7 @@ TEST(federate_tests, enterExecAfterFinal)
     Fed1->finalize();
 }
 
-TEST(federate_tests, enterExecAfterFinalAsync)
+TEST(federate, enterExecAfterFinalAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_eca";
@@ -851,7 +874,7 @@ TEST(federate_tests, enterExecAfterFinalAsync)
     Fed1->finalize();
 }
 
-TEST(federate_tests, iterativeTimeRequestHalt)
+TEST(federate, iterativeTimeRequestHalt)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_eca1";
@@ -870,7 +893,7 @@ TEST(federate_tests, iterativeTimeRequestHalt)
     Fed1->finalize();
 }
 
-TEST(federate_tests, iterativeTimeRequestAsyncHalt)
+TEST(federate, iterativeTimeRequestAsyncHalt)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_eca2";
@@ -890,7 +913,7 @@ TEST(federate_tests, iterativeTimeRequestAsyncHalt)
     Fed1->finalize();
 }
 
-TEST(federate_tests, enterExecAsync)
+TEST(federate, enterExecAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_d";
@@ -903,7 +926,7 @@ TEST(federate_tests, enterExecAsync)
     EXPECT_NO_THROW(Fed1->finalize());
 }
 
-TEST(federate_tests, enterExecAsyncIterative)
+TEST(federate, enterExecAsyncIterative)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e";
@@ -921,7 +944,7 @@ TEST(federate_tests, enterExecAsyncIterative)
     EXPECT_NO_THROW(Fed1->finalize());
 }
 
-TEST(federate_tests, enterRequestTimeAsyncIterative)
+TEST(federate, enterRequestTimeAsyncIterative)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e";
@@ -955,7 +978,7 @@ TEST(federate_tests, enterRequestTimeAsyncIterative)
     Fed1->finalizeComplete();
 }
 
-TEST(federate_tests, enterRequestTimeAsyncIterativeFinalize)
+TEST(federate, enterRequestTimeAsyncIterativeFinalize)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e2";
@@ -971,7 +994,7 @@ TEST(federate_tests, enterRequestTimeAsyncIterativeFinalize)
     EXPECT_EQ(tm, helics::Time::maxVal());
 }
 
-TEST(federate_tests, enterRequestTimeAsyncFinalize)
+TEST(federate, enterRequestTimeAsyncFinalize)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e3";
@@ -985,7 +1008,7 @@ TEST(federate_tests, enterRequestTimeAsyncFinalize)
     EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::FINALIZE);
 }
 
-TEST(federate_tests, enterRequestTimeAsyncFinalizeAsync)
+TEST(federate, enterRequestTimeAsyncFinalizeAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e3a";
@@ -1000,7 +1023,7 @@ TEST(federate_tests, enterRequestTimeAsyncFinalizeAsync)
     EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::FINALIZE);
 }
 
-TEST(federate_tests, enterEnterExecAsyncFinalize)
+TEST(federate, enterEnterExecAsyncFinalize)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e4";
@@ -1013,7 +1036,7 @@ TEST(federate_tests, enterEnterExecAsyncFinalize)
     EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::FINALIZE);
 }
 
-TEST(federate_tests, enterEnterInitAsyncFinalize)
+TEST(federate, enterEnterInitAsyncFinalize)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e5";
@@ -1025,7 +1048,7 @@ TEST(federate_tests, enterEnterInitAsyncFinalize)
     EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::FINALIZE);
 }
 
-TEST(federate_tests, enterEnterExecAsyncFinalizeAsync)
+TEST(federate, enterEnterExecAsyncFinalizeAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e4a";
@@ -1039,7 +1062,7 @@ TEST(federate_tests, enterEnterExecAsyncFinalizeAsync)
     EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::FINALIZE);
 }
 
-TEST(federate_tests, enterEnterInitAsyncFinalizeAsync)
+TEST(federate, enterEnterInitAsyncFinalizeAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_e5a";
@@ -1052,7 +1075,7 @@ TEST(federate_tests, enterEnterInitAsyncFinalizeAsync)
     EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::FINALIZE);
 }
 
-TEST(federate_tests, enterExecPendingTimeIterative)
+TEST(federate, enterExecPendingTimeIterative)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_epa";
@@ -1067,7 +1090,7 @@ TEST(federate_tests, enterExecPendingTimeIterative)
     EXPECT_EQ(Fed1->getCurrentMode(), helics::Federate::Modes::FINALIZE);
 }
 
-TEST(federate_tests, forceErrorExec)
+TEST(federate, forceErrorExec)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_fe";
@@ -1084,7 +1107,7 @@ TEST(federate_tests, forceErrorExec)
     Fed1->getCorePointer()->disconnect();
 }
 
-TEST(federate_tests, forceErrorExecAsync)
+TEST(federate, forceErrorExecAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_fe1";
@@ -1101,7 +1124,7 @@ TEST(federate_tests, forceErrorExecAsync)
     Fed1->getCorePointer()->disconnect();
 }
 
-TEST(federate_tests, forceErrorInitAsync)
+TEST(federate, forceErrorInitAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_fe2";
@@ -1118,7 +1141,7 @@ TEST(federate_tests, forceErrorInitAsync)
     Fed1->getCorePointer()->disconnect();
 }
 
-TEST(federate_tests, forceErrorPendingTimeAsync)
+TEST(federate, forceErrorPendingTimeAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_fe3";
@@ -1135,7 +1158,7 @@ TEST(federate_tests, forceErrorPendingTimeAsync)
     Fed1->getCorePointer()->disconnect();
 }
 
-TEST(federate_tests, federateGeneratedLocalError)
+TEST(federate, federateGeneratedLocalError)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_le";
@@ -1153,7 +1176,7 @@ TEST(federate_tests, federateGeneratedLocalError)
     EXPECT_THROW(Fed1->localError(9827, "user generated error2"), helics::FederateError);
 }
 
-TEST(federate_tests, federateGeneratedGlobalError)
+TEST(federate, federateGeneratedGlobalError)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_ge";
@@ -1173,7 +1196,7 @@ TEST(federate_tests, federateGeneratedGlobalError)
     EXPECT_THROW(Fed1->globalError(9827, "user generated global error2"), helics::FederateError);
 }
 
-TEST(federate_tests, federateGeneratedlocalErrorEscalation)
+TEST(federate, federateGeneratedlocalErrorEscalation)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_ge";
@@ -1193,7 +1216,7 @@ TEST(federate_tests, federateGeneratedlocalErrorEscalation)
     EXPECT_THROW(Fed1->globalError(9827, "user generated global error2"), helics::FederateError);
 }
 
-TEST(federate_tests, queryTest1)
+TEST(federate, queryTest1)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_q";
@@ -1228,7 +1251,7 @@ TEST(federate_tests, queryTest1)
     EXPECT_NO_THROW(Fed1->logMessage(10, "test log message"));
 }
 
-TEST(federate_tests, forceErrorPendingTimeIterativeAsync)
+TEST(federate, forceErrorPendingTimeIterativeAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_fe4";
@@ -1245,7 +1268,7 @@ TEST(federate_tests, forceErrorPendingTimeIterativeAsync)
     Fed1->getCorePointer()->disconnect();
 }
 
-TEST(federate_tests, forceErrorFinalizeAsync)
+TEST(federate, forceErrorFinalizeAsync)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_fe5";
@@ -1262,7 +1285,7 @@ TEST(federate_tests, forceErrorFinalizeAsync)
     Fed1->getCorePointer()->disconnect();
 }
 
-TEST(federate_tests, error_after_disconnect)
+TEST(federate, error_after_disconnect)
 {
     helics::FederateInfo fi(helics::CoreType::TEST);
     fi.coreName = "core_full_g";
@@ -1384,6 +1407,4 @@ TEST_P(federate_global_files, core_global_file_ci_skip)
     brk->waitForDisconnect();
 }
 
-INSTANTIATE_TEST_SUITE_P(federate_tests,
-                         federate_global_files,
-                         ::testing::ValuesIn(simple_global_files));
+INSTANTIATE_TEST_SUITE_P(federate, federate_global_files, ::testing::ValuesIn(simple_global_files));
diff --git a/tests/helics/application_api/ValueFederateAdditionalTests.cpp b/tests/helics/application_api/ValueFederateAdditionalTests.cpp
index 223dde86be..2fa225297d 100644
--- a/tests/helics/application_api/ValueFederateAdditionalTests.cpp
+++ b/tests/helics/application_api/ValueFederateAdditionalTests.cpp
@@ -678,7 +678,7 @@ TEST(valuefederate, toml_file_bad)
     helics::CoreFactory::terminateAllCores();
 }
 
-INSTANTIATE_TEST_SUITE_P(valuefed_tests,
+INSTANTIATE_TEST_SUITE_P(valuefed,
                          valuefed_add_configfile_tests,
                          ::testing::ValuesIn(config_files));
 
@@ -788,13 +788,11 @@ TEST(valuefed_json_tests, test_json_register_publish_error)
     vFed.disconnect();
 }
 
-INSTANTIATE_TEST_SUITE_P(valuefed_tests,
+INSTANTIATE_TEST_SUITE_P(valuefed,
                          valuefed_add_single_type_tests_ci_skip,
                          ::testing::ValuesIn(CoreTypes_single));
-INSTANTIATE_TEST_SUITE_P(valuefed_tests,
-                         valuefed_add_type_tests_ci_skip,
-                         ::testing::ValuesIn(CoreTypes));
-INSTANTIATE_TEST_SUITE_P(valuefed_tests,
+INSTANTIATE_TEST_SUITE_P(valuefed, valuefed_add_type_tests_ci_skip, ::testing::ValuesIn(CoreTypes));
+INSTANTIATE_TEST_SUITE_P(valuefed,
                          valuefed_add_all_type_tests_ci_skip,
                          ::testing::ValuesIn(CoreTypes_all));
 
diff --git a/tests/helics/application_api/ValueFederateKeyTests.cpp b/tests/helics/application_api/ValueFederateKeyTests.cpp
index 0b7e1f48c2..e6efcb7336 100644
--- a/tests/helics/application_api/ValueFederateKeyTests.cpp
+++ b/tests/helics/application_api/ValueFederateKeyTests.cpp
@@ -35,7 +35,7 @@ class valuefed_all_type_tests:
     public ::testing::TestWithParam<const char*>,
     public FederateTestFixture {};
 
-class valuefed_tests: public ::testing::Test, public FederateTestFixture {};
+class valuefed: public ::testing::Test, public FederateTestFixture {};
 
 static const auto testNamer = [](const ::testing::TestParamInfo<const char*>& parameter) {
     return std::string(parameter.param);
@@ -100,7 +100,7 @@ TEST_P(valuefed_single_type, subscriber_and_publisher_registration)
     EXPECT_TRUE(vFed1->getCurrentMode() == Federate::Modes::FINALIZE);
 }
 
-TEST_F(valuefed_tests, single_transfer_publisher_alias)
+TEST_F(valuefed, single_transfer_publisher_alias)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -141,7 +141,7 @@ TEST_F(valuefed_tests, single_transfer_publisher_alias)
     vFed1->finalize();
 }
 
-TEST_F(valuefed_tests, single_transfer_publisher_alias2)
+TEST_F(valuefed, single_transfer_publisher_alias2)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -384,7 +384,7 @@ TEST_P(valuefed_all_type_tests, dual_transfer_broker_link)
     EXPECT_TRUE(res);
 }
 
-TEST_F(valuefed_tests, dual_transfer_brokerApp_link)
+TEST_F(valuefed, dual_transfer_brokerApp_link)
 {
     SetupTest<helics::ValueFederate>("test", 2);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -430,12 +430,10 @@ TEST_P(valuefed_flagfile_tests, configure_test)
     V2.finalize();
 }
 
-INSTANTIATE_TEST_SUITE_P(valuefed_tests,
-                         valuefed_flagfile_tests,
-                         ::testing::ValuesIn(config_files));
+INSTANTIATE_TEST_SUITE_P(valuefed, valuefed_flagfile_tests, ::testing::ValuesIn(config_files));
 #endif
 
-TEST_F(valuefed_tests, dual_transfer_coreApp_link)
+TEST_F(valuefed, dual_transfer_coreApp_link)
 {
     SetupTest<helics::ValueFederate>("test", 2);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -515,7 +513,7 @@ TEST_P(valuefed_link_file, dual_transfer_broker_link_file)
     EXPECT_TRUE(res);
 }
 
-TEST_F(valuefed_tests, dual_transfer_broker_link_json_string)
+TEST_F(valuefed, dual_transfer_broker_link_json_string)
 {
     SetupTest<helics::ValueFederate>("test", 2);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -643,11 +641,11 @@ TEST_P(valuefed_link_file, dual_transfer_core_link_file)
     EXPECT_TRUE(res);
 }
 
-INSTANTIATE_TEST_SUITE_P(valuefed_tests,
+INSTANTIATE_TEST_SUITE_P(valuefed,
                          valuefed_link_file,
                          ::testing::ValuesIn(simple_connection_files));
 
-TEST_F(valuefed_tests, dual_transfer_core_link_json_string)
+TEST_F(valuefed, dual_transfer_core_link_json_string)
 {
     SetupTest<helics::ValueFederate>("test", 2);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -735,7 +733,7 @@ TEST_P(valuefed_single_type, block_send_receive)
 
 /** test the all callback*/
 
-TEST_F(valuefed_tests, all_callback)
+TEST_F(valuefed, all_callback)
 {
     SetupTest<helics::ValueFederate>("test", 1, 1.0);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -798,7 +796,7 @@ TEST_F(valuefed_tests, all_callback)
     vFed1->finalize();
 }
 
-TEST_F(valuefed_tests, time_update_callback)
+TEST_F(valuefed, time_update_callback)
 {
     SetupTest<helics::ValueFederate>("test", 1, 1.0);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -855,7 +853,66 @@ TEST_F(valuefed_tests, time_update_callback)
     vFed1->finalize();
 }
 
-TEST_F(valuefed_tests, mode_update_callback)
+TEST_F(valuefed, time_update_callback_single_thread)
+{
+    extraFederateArgs = "--flags=single_thread_federate";
+    SetupTest<helics::ValueFederate>("test", 1, 1.0);
+    auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
+
+    EXPECT_TRUE(vFed1->getFlagOption(HELICS_FLAG_SINGLE_THREAD_FEDERATE));
+    auto& pubid1 = vFed1->registerPublication<std::string>("pub1");
+    auto& pubid2 = vFed1->registerGlobalPublication<int>("pub2");
+
+    auto& pubid3 = vFed1->registerPublication("pub3", "");
+
+    auto& sub1 = vFed1->registerSubscription("fed0/pub1", "");
+    auto& sub2 = vFed1->registerSubscription("pub2", "");
+    auto& sub3 = vFed1->registerSubscription("fed0/pub3", "");
+
+    helics::SmallBuffer db(547, ';');
+    helics::InterfaceHandle lastId;
+    helics::Time lastTime{helics::Time::minVal()};
+    int validCount{0};
+    vFed1->setInputNotificationCallback([&](const helics::Input& subid, helics::Time callTime) {
+        lastTime = callTime;
+        lastId = subid.getHandle();
+    });
+    vFed1->setTimeUpdateCallback([&](helics::Time newTime, bool iterating) {
+        if (newTime > lastTime && !iterating) {
+            ++validCount;
+        }
+    });
+    vFed1->enterExecutingMode();
+    EXPECT_EQ(validCount, 1);
+    vFed1->publishBytes(pubid3, db);
+    vFed1->requestTime(1.0);
+    // the callbacks should have occurred here
+    EXPECT_EQ(validCount, 2);
+    EXPECT_TRUE(lastId == sub3.getHandle());
+    if (lastId == sub3.getHandle()) {
+        EXPECT_EQ(lastTime, 1.0);
+        EXPECT_EQ(vFed1->getLastUpdateTime(sub3), lastTime);
+    } else {
+        EXPECT_TRUE(false) << " missed callback\n";
+    }
+
+    pubid2.publish(4);
+    vFed1->requestTime(2.0);
+    // the callback should have occurred here
+    EXPECT_EQ(validCount, 3);
+    EXPECT_TRUE(lastId == sub2.getHandle());
+    EXPECT_EQ(lastTime, 2.0);
+    pubid1.publish("this is a test");
+    vFed1->requestTime(3.0);
+    // the callback should have occurred here
+    EXPECT_EQ(validCount, 4);
+    EXPECT_TRUE(lastId == sub1.getHandle());
+    EXPECT_EQ(lastTime, 3.0);
+
+    vFed1->finalize();
+}
+
+TEST_F(valuefed, mode_update_callback)
 {
     using Modes = helics::Federate::Modes;
     SetupTest<helics::ValueFederate>("test", 1, 1.0);
@@ -1093,7 +1150,7 @@ TEST_P(valuefed_all_type_tests, dual_transfer_remove_target)
     vFed2->finalize();
 }
 
-TEST_F(valuefed_tests, rem_target_single_test)
+TEST_F(valuefed, rem_target_single_test)
 {
     SetupTest<helics::ValueFederate>("test", 2);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -1231,7 +1288,7 @@ INSTANTIATE_TEST_SUITE_P(valuefed_key_tests,
                          ::testing::ValuesIn(CoreTypes_all),
                          testNamer);
 
-TEST_F(valuefed_tests, empty_get_default)
+TEST_F(valuefed, empty_get_default)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -1251,7 +1308,7 @@ TEST_F(valuefed_tests, empty_get_default)
     vFed1->finalize();
 }
 
-TEST_F(valuefed_tests, empty_get_complex)
+TEST_F(valuefed, empty_get_complex)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -1273,7 +1330,7 @@ TEST_F(valuefed_tests, empty_get_complex)
     vFed1->finalize();
 }
 
-TEST_F(valuefed_tests, publish_time_restrict)
+TEST_F(valuefed, publish_time_restrict)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -1300,7 +1357,7 @@ TEST_F(valuefed_tests, publish_time_restrict)
     EXPECT_GE(returned.size(), 19);
 }
 
-TEST_F(valuefed_tests, input_time_restrict)
+TEST_F(valuefed, input_time_restrict)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -1327,7 +1384,7 @@ TEST_F(valuefed_tests, input_time_restrict)
     EXPECT_GE(returned.size(), 19);
 }
 
-TEST_F(valuefed_tests, publish_change_restrict)
+TEST_F(valuefed, publish_change_restrict)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
@@ -1354,7 +1411,7 @@ TEST_F(valuefed_tests, publish_change_restrict)
     EXPECT_GE(returned.size(), 19);
 }
 
-TEST_F(valuefed_tests, input_change_restrict)
+TEST_F(valuefed, input_change_restrict)
 {
     SetupTest<helics::ValueFederate>("test", 1);
     auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
diff --git a/tests/helics/application_api/testFixtures.hpp b/tests/helics/application_api/testFixtures.hpp
index eac1283586..b820fcc2b7 100644
--- a/tests/helics/application_api/testFixtures.hpp
+++ b/tests/helics/application_api/testFixtures.hpp
@@ -80,7 +80,9 @@ struct FederateTestFixture {
         if (time_delta != helics::timeZero) {
             fi.setProperty(HELICS_PROPERTY_TIME_DELTA, time_delta);
         }
-
+        if (!extraFederateArgs.empty()) {
+            fi.loadInfoFromArgsIgnoreOutput(extraFederateArgs);
+        }
         switch (setup) {
             case 1:
             default: {
@@ -218,6 +220,7 @@ struct FederateTestFixture {
     std::vector<std::shared_ptr<helics::Federate>> federates;
     std::string extraCoreArgs;
     std::string extraBrokerArgs;
+    std::string extraFederateArgs;
     std::string ctype;
     bool debugDiagnostic{false};
 };
diff --git a/tests/helics/application_api/testFixtures_shared.hpp b/tests/helics/application_api/testFixtures_shared.hpp
index faff686ba9..3f68f9ac6e 100644
--- a/tests/helics/application_api/testFixtures_shared.hpp
+++ b/tests/helics/application_api/testFixtures_shared.hpp
@@ -72,11 +72,13 @@ struct FederateTestFixture {
             initString.append(extraCoreArgs);
         }
 
-        helics::FederateInfo fi(helics::coreTypeFromString(std::string(CoreType_name)));
+        helics::FederateInfo fi(helics::coreTypeFromString(CoreType_name));
         if (time_delta != helics::timeZero) {
             fi.setProperty(HELICS_PROPERTY_TIME_DELTA, time_delta);
         }
-
+        if (!extraFederateArgs.empty()) {
+            fi.loadInfoFromArgsIgnoreOutput(extraFederateArgs);
+        }
         switch (setup) {
             case 1:
             default: {
@@ -211,5 +213,6 @@ struct FederateTestFixture {
     std::vector<std::shared_ptr<helics::Federate>> federates;
     std::string extraCoreArgs;
     std::string extraBrokerArgs;
+    std::string extraFederateArgs;
     std::string ctype;
 };
diff --git a/tests/helics/shared_library/CallbackFederateTests.cpp b/tests/helics/shared_library/CallbackFederateTests.cpp
index 024f0652bf..0938de72d2 100644
--- a/tests/helics/shared_library/CallbackFederateTests.cpp
+++ b/tests/helics/shared_library/CallbackFederateTests.cpp
@@ -117,7 +117,7 @@ TEST_F(callback_federate_tests, timeStepsPeriodMax)
     SetupTest(helicsCreateCallbackFederate, "test", 1);
     auto vFed1 = GetFederateAt(0);
 
-    helicsFederateSetTimeProperty(vFed1, HELICS_PROPERTY_TIME_MAXTIME, 3.0, NULL);
+    helicsFederateSetTimeProperty(vFed1, HELICS_PROPERTY_TIME_STOPTIME, 3.0, NULL);
     helicsFederateSetTimeProperty(vFed1, HELICS_PROPERTY_TIME_PERIOD, 1.0, NULL);
 
     int cb1{0};
@@ -160,9 +160,8 @@ TEST_F(callback_federate_tests, initException)
     SetupTest(helicsCreateCallbackFederate, "test", 1);
     auto vFed1 = GetFederateAt(0);
 
-    std::function<HelicsIterationRequest()> initCall = []() {
+    std::function<HelicsIterationRequest()> initCall = []() -> HelicsIterationRequest {
         throw std::runtime_error("ETEST");
-        return HELICS_ITERATION_REQUEST_NO_ITERATION;
     };
     helicsCallbackFederateInitializeCallback(vFed1, initFunction, &initCall, NULL);
 
diff --git a/tests/helics/system_tests/ErrorTests.cpp b/tests/helics/system_tests/ErrorTests.cpp
index 1ca1fb1c82..db078252b7 100644
--- a/tests/helics/system_tests/ErrorTests.cpp
+++ b/tests/helics/system_tests/ErrorTests.cpp
@@ -131,6 +131,33 @@ TEST_F(error_tests, already_init_core)
     broker->disconnect();
 }
 
+TEST_F(error_tests, single_thread_fed)
+{
+    extraFederateArgs = "--flags=single_thread_federate";
+    auto broker = AddBroker("test", 1);
+    AddFederates<helics::ValueFederate>("test", 1, broker, 1.0, "fed");
+
+    auto fed1 = GetFederateAs<helics::ValueFederate>(0);
+    EXPECT_THROW(fed1->enterInitializingModeAsync(), helics::InvalidFunctionCall);
+    fed1->enterInitializingMode();
+    EXPECT_THROW(fed1->enterExecutingModeAsync(), helics::InvalidFunctionCall);
+    fed1->enterExecutingMode();
+
+    EXPECT_THROW(fed1->requestTimeAsync(3.2), helics::InvalidFunctionCall);
+    EXPECT_THROW(fed1->requestTimeComplete(), helics::InvalidFunctionCall);
+    auto t1 = fed1->requestTime(2.0);
+    EXPECT_EQ(t1, 2.0);
+
+    EXPECT_THROW(fed1->requestTimeIterativeAsync(3.2, helics::IterationRequest::FORCE_ITERATION),
+                 helics::InvalidFunctionCall);
+    EXPECT_THROW(fed1->requestTimeIterativeComplete(), helics::InvalidFunctionCall);
+
+    EXPECT_THROW(fed1->finalizeAsync(), helics::InvalidFunctionCall);
+
+    fed1->finalize();
+    broker->disconnect();
+}
+
 TEST_F(error_tests, duplicate_publication_names)
 {
     auto broker = AddBroker("test", 1);
diff --git a/tests/helics/system_tests/TimingTests.cpp b/tests/helics/system_tests/TimingTests.cpp
index d8dfa55cec..8a691a08a7 100644
--- a/tests/helics/system_tests/TimingTests.cpp
+++ b/tests/helics/system_tests/TimingTests.cpp
@@ -113,6 +113,88 @@ TEST_F(timing, simple_timing_message)
                         // it will time out.
 }
 
+TEST_F(timing, simple_timing2_single_thread)
+{
+    extraFederateArgs = "--flags=single_thread_federate";
+
+    SetupTest<helics::ValueFederate>("test", 2);
+    auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
+    auto vFed2 = GetFederateAs<helics::ValueFederate>(1);
+    vFed1->setFlagOption(HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS);
+    vFed2->setFlagOption(HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS);
+    vFed1->setProperty(HELICS_PROPERTY_TIME_PERIOD, 0.5);
+    vFed2->setProperty(HELICS_PROPERTY_TIME_PERIOD, 0.5);
+
+    auto& pub = vFed1->registerGlobalPublication<double>("pub1");
+    vFed2->registerSubscription("pub1");
+    std::vector<helics::Time> times;
+
+    auto t1 = std::thread([&vFed1, &times, &pub]() {
+        vFed1->enterExecutingMode();
+        auto res = vFed1->requestTime(0.32);
+        times.push_back(res);
+        pub.publish(0.27);
+        res = vFed1->requestTime(1.85);
+        times.push_back(res);
+    });
+
+    vFed2->enterExecutingMode();
+
+    auto res = vFed2->requestTime(1.79);
+    EXPECT_EQ(res, 0.5);  // the result should show up at the next available time point
+    res = vFed2->requestTime(2.0);
+    EXPECT_EQ(res, 2.0);
+
+    t1.join();
+    // check that the request is only granted at the appropriate period
+    EXPECT_EQ(times[0], 0.5);
+
+    EXPECT_EQ(times[1], 2.0);
+    vFed1->finalize();
+    vFed2->finalize();
+}
+
+TEST_F(timing, simple_timing_message_single_thread)
+{
+    extraFederateArgs = "--flags=single_thread_federate";
+
+    SetupTest<helics::MessageFederate>("test", 2);
+    auto vFed1 = GetFederateAs<helics::MessageFederate>(0);
+    auto vFed2 = GetFederateAs<helics::MessageFederate>(1);
+
+    vFed1->setProperty(HELICS_PROPERTY_TIME_PERIOD, 0.6);
+    vFed2->setProperty(HELICS_PROPERTY_TIME_PERIOD, 0.45);
+    vFed1->setFlagOption(HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS);
+    vFed2->setFlagOption(HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS);
+    auto& ept1 = vFed1->registerGlobalEndpoint("e1");
+    vFed2->registerGlobalEndpoint("e2");
+
+    std::vector<helics::Time> times;
+    auto t1 = std::thread([&vFed1, &times, &ept1]() {
+        vFed1->enterExecutingMode();
+        auto res = vFed1->requestTime(0.32);
+        times.push_back(res);
+        ept1.sendTo("test1", "e2");
+        res = vFed1->requestTime(1.85);
+        times.push_back(res);
+    });
+
+    vFed2->enterExecutingMode();
+    auto res = vFed2->requestTime(3.5);
+
+    EXPECT_THROW(vFed2->requestTimeComplete(), helics::InvalidFunctionCall);
+    EXPECT_EQ(res, 0.9);  // the message should show up at the next available time point
+    res = vFed2->requestTime(2.0);
+    EXPECT_EQ(res, 2.25);  // the message should show up at the next available time point
+    vFed2->finalize();
+
+    t1.join();
+    EXPECT_EQ(times[0], 0.6);
+
+    EXPECT_EQ(times[1], 2.4);
+    vFed1->finalize();
+}
+
 TEST_F(timing, simple_global_timing_message)
 {
     extraBrokerArgs = " --globaltime ";

From cd5325b69f15a2361ba03536975e08f40ec521b9 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Tue, 11 Oct 2022 06:09:59 -0700
Subject: [PATCH 07/16] External subprojects (#2444)

* try to get things with external subprojects working

* make HELICS work better as a subproject

* more cleanup for cmake in support of using HELICS as a subproject

* add a flag to hid variables

* protect toml11

* move some code out from the main CMake

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

* some more tweaks to the cmake

* tweak the precommit

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* try another tweak

* remove old file

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>
---
 .pre-commit-config.yaml                       |   2 +-
 CMakeLists.txt                                | 299 ++++--------------
 config/cmake/AddGooglebenchmark.cmake         |  17 +-
 config/cmake/AddGoogletest.cmake              |  84 ++---
 config/cmake/BuildType.cmake                  |  18 +-
 .../cmake/CheckLatestCXXStandardOption.cmake  |  10 +-
 config/cmake/FindZeroMQ.cmake                 | 107 ++-----
 config/cmake/addBoost.cmake                   |  55 ++--
 config/cmake/addGitHooks.cmake                |  86 ++---
 config/cmake/addJsoncpp.cmake                 | 134 ++++----
 config/cmake/addMPI.cmake                     |  52 +--
 config/cmake/addNetworking.cmake              |  44 +++
 config/cmake/addSpdlog.cmake                  |  77 ++---
 config/cmake/addUnits.cmake                   |  56 ++--
 config/cmake/addUtilities.cmake               |  31 ++
 config/cmake/addZeroMQ.cmake                  |  45 +--
 config/cmake/addfmt.cmake                     |  69 ++--
 config/cmake/addlibzmq.cmake                  | 169 +++-------
 config/cmake/clang-cxx-dev-tools.cmake        |  79 ++---
 config/cmake/combineLicenses.cmake            |  16 +-
 config/cmake/commonBuildFlags.cmake           |  68 ++++
 config/cmake/commonBuildPaths.cmake           |  93 ++++++
 config/cmake/commonRPath.cmake                |  49 +++
 config/cmake/compiler_flags.cmake             | 162 +++++-----
 config/cmake/copy_key_files.cmake             |  30 +-
 config/cmake/escape_string.cmake              |   4 +-
 config/cmake/extraMacros.cmake                |  89 +++---
 config/cmake/updateGitSubmodules.cmake        | 116 ++++---
 config/cmake/version_describe.cmake           |  42 +--
 .../installation/helics_cmake_options.md      |   1 +
 interfaces/java/addLoadLibraryCommand.cmake   |  25 +-
 interfaces/java/installJar.cmake              |   0
 interfaces/java/javaSwigGenerateOnly.cmake    |  49 ++-
 interfaces/java/overwriteJavaFiles.cmake      |   6 +-
 .../octave/generateOCTcreationScript.cmake    |   4 +-
 interfaces/octave/modifyOctSourceFile.cmake   |  22 +-
 src/helics/CMakeLists.txt                     |   8 +-
 src/helics/common/CMakeLists.txt              |   9 +-
 .../collect_cxx_shared_headers.cmake          |  16 +-
 .../cxx_shared_library/cxx_file_list.cmake    |   7 +-
 40 files changed, 1049 insertions(+), 1201 deletions(-)
 create mode 100644 config/cmake/addNetworking.cmake
 create mode 100644 config/cmake/addUtilities.cmake
 create mode 100644 config/cmake/commonBuildFlags.cmake
 create mode 100644 config/cmake/commonBuildPaths.cmake
 create mode 100644 config/cmake/commonRPath.cmake
 delete mode 100644 interfaces/java/installJar.cmake

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c98ca7501f..970d6f49f8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -60,7 +60,7 @@ repos:
     rev: v0.6.13
     hooks:
       - id: cmake-format
-        exclude: "cmake+"
+        exclude: "cmake_+"
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.1
     hooks:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d3d23116e..ec82d80c57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ project(HELICS VERSION 3.3.0)
 # -----------------------------------------------------------------------------
 set(HELICS_VERSION_BUILD)
 # use ISO date YYYY-MM-DD
-set(HELICS_DATE "2022-09-15")
+set(HELICS_DATE "2022-10-09")
 
 set(HELICS_VERSION_UNDERSCORE
     "${HELICS_VERSION_MAJOR}_${HELICS_VERSION_MINOR}_${HELICS_VERSION_PATCH}"
@@ -44,15 +44,22 @@ message(STATUS "SYSTEM INFO -> ${HELICS_COMPILER_VERSION}")
 # -----------------------------------------------------------------------------
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/config/cmake/"
                           "${PROJECT_SOURCE_DIR}/ThirdParty/cmake/"
     )
 else()
-    set(ORIGINAL_MODULE_PATH ${CMAKE_MODULE_PATH})
+    set(${PROJECT_NAME}_ORIGINAL_MODULE_PATH ${CMAKE_MODULE_PATH})
     set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/config/cmake/"
                           "${PROJECT_SOURCE_DIR}/ThirdParty/cmake/" ${CMAKE_MODULE_PATH}
     )
+
+endif()
+
+include(commonBuildPaths)
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+else()
     get_property(helics-use-folders GLOBAL PROPERTY USE_FOLDERS)
 endif()
 
@@ -74,83 +81,6 @@ include(extraMacros)
 include(CMakeDependentOption)
 include(copy_key_files)
 include(CTest)
-include(ucm)
-
-# include(BuildType)
-# -----------------------------------------------------------------------------
-# set the install path to a local directory
-# -----------------------------------------------------------------------------
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    if(WIN32)
-        if(MSVC)
-            set(CMAKE_INSTALL_PREFIX "C:/local/helics_${HELICS_VERSION_UNDERSCORE}/"
-                CACHE PATH "default install path" FORCE
-            )
-        elseif(MINGW AND NOT MSYS)
-            set(CMAKE_INSTALL_PREFIX "C:/local/helics_${HELICS_VERSION_UNDERSCORE}/"
-                CACHE PATH "default install path" FORCE
-            )
-        elseif(MSYS)
-            # use CMAKE_OBJCOPY here since it is somewhat less likely to be overridden by users
-            # rather than the compiler
-            get_filename_component(path_bin ${CMAKE_OBJCOPY} DIRECTORY)
-            get_filename_component(path_install ${path_bin} DIRECTORY)
-            set(CMAKE_INSTALL_PREFIX ${path_install} CACHE PATH "default install path" FORCE)
-        endif(MSVC)
-    endif(WIN32)
-endif()
-
-# Warning if CMAKE_INSTALL_PREFIX is empty. Likely set by using the wrong environment variable.
-if(NOT CMAKE_INSTALL_PREFIX)
-    message(
-        WARNING
-            "CMAKE_INSTALL_PREFIX is set to nothing. If you are using an environment variable for handling prefix paths, that variable might not have been set before using it with CMake to set the CMAKE_INSTALL_PREFIX option."
-    )
-endif()
-
-# Check to make sure the install prefix isn't the build folder, if it is, build errors will happen
-get_filename_component(tmp_install_prefix "${CMAKE_INSTALL_PREFIX}" REALPATH)
-get_filename_component(tmp_proj_bindir "${PROJECT_BINARY_DIR}" REALPATH)
-# Windows paths are case insensitive
-if(WIN32)
-    string(TOLOWER "${tmp_install_prefix}" tmp_install_prefix)
-    string(TOLOWER "${tmp_proj_bindir}" tmp_proj_bindir)
-endif()
-if(tmp_install_prefix STREQUAL tmp_proj_bindir)
-    message(FATAL_ERROR "CMAKE_INSTALL_PREFIX must not be set to the build folder")
-endif()
-
-if(MSYS
-   OR CYGWIN
-   OR UNIX
-   OR APPLE
-)
-    set(UNIX_LIKE TRUE)
-endif()
-
-# Set the build output paths
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" CACHE PATH
-                                                                           "Archive output dir."
-        )
-    endif()
-    if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" CACHE PATH
-                                                                           "Library output dir."
-        )
-    endif()
-    if(NOT CMAKE_PDB_OUTPUT_DIRECTORY)
-        set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-            CACHE PATH "PDB (MSVC debug symbol)output dir."
-        )
-    endif()
-    if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-            CACHE PATH "Executable/dll output dir."
-        )
-    endif()
-endif()
 
 if(NOT CMAKE_VERSION VERSION_LESS 3.12)
     option(
@@ -250,74 +180,16 @@ cmake_dependent_advanced_option(
     HELICS_ENABLE_DEBUG_LOGGING "enable debug logging" ON "HELICS_ENABLE_LOGGING" ON
 )
 
-# -----------------------------------------------------------------------------
-# General project wide configuration for debug postfix
-# -----------------------------------------------------------------------------
-if(NOT NO_DEBUG_POSFIX AND NOT CMAKE_DEBUG_POSTFIX)
-    set(CMAKE_DEBUG_POSTFIX d)
-endif()
+include(commonBuildFlags)
 
 # add a baseline library for underlying dependencies and flags
 add_library(helics_base INTERFACE)
 
-# Prohibit in-source build
-if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
-    message(
-        FATAL_ERROR
-            "In-source build is not supported. Please, use an empty directory for building the project."
-    )
-endif()
-
-if(NOT TARGET compile_flags_target)
-    add_library(compile_flags_target INTERFACE)
-endif()
-
-if(NOT TARGET build_flags_target)
-    add_library(build_flags_target INTERFACE)
-endif()
-
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    mark_as_advanced(BUILD_TESTING)
-    include(compiler_flags)
-
-endif()
-
 add_library(HELICS::compile_flags_target ALIAS compile_flags_target)
 add_library(HELICS::build_flags_target ALIAS build_flags_target)
 
 get_target_property(EXTRA_BUILD_FLAGS build_flags_target INTERFACE_COMPILE_OPTIONS)
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    if(NOT USE_LIBCXX)
-        show_variable(STATIC_STANDARD_LIB STRING "Link against a static standard lib" default)
-        set_property(CACHE STATIC_STANDARD_LIB PROPERTY STRINGS default static dynamic)
-    else()
-        hide_variable(STATIC_STANDARD_LIB)
-    endif()
-    if(MSVC)
-        show_variable(HELICS_EMBEDDED_DEBUG_INFO STRING "embed debug info into lib files" default)
-        set_property(CACHE HELICS_EMBEDDED_DEBUG_INFO PROPERTY STRINGS default embedded external)
-    else()
-        hide_variable(HELICS_EMBEDDED_DEBUG_INFO)
-    endif()
-endif()
-
-if(STATIC_STANDARD_LIB STREQUAL "default")
-
-elseif(STATIC_STANDARD_LIB STREQUAL "static")
-    ucm_set_runtime(STATIC)
-elseif(STATIC_STANDARD_LIB STREQUAL "dynamic")
-    ucm_set_runtime(DYNAMIC)
-endif()
-
-if(HELICS_EMBEDDED_DEBUG_INFO STREQUAL "default")
-
-elseif(HELICS_EMBEDDED_DEBUG_INFO STREQUAL "external")
-    ucm_set_embedded_debug(EXTERNAL)
-else()
-    ucm_set_embedded_debug(EMBEDDED)
-endif()
-
 # -------------------------------------------------------------
 # add coverage target
 # -------------------------------------------------------------
@@ -431,12 +303,14 @@ endif()
 # -------------------------------------------------------------
 # TOML11  add the TOML interpreter
 # -------------------------------------------------------------
+if(NOT TARGET toml11::toml11)
+    set(toml11_BUILD_TEST OFF CACHE INTERNAL "")
+    set(toml11_TEST_WITH_ASAN OFF CACHE INTERNAL "")
+    set(toml11_TEST_WITH_UBSAN OFF CACHE INTERNAL "")
+    set(toml11_INSTALL OFF CACHE INTERNAL "")
+    add_subdirectory(ThirdParty/toml EXCLUDE_FROM_ALL)
 
-set(toml11_BUILD_TEST OFF CACHE INTERNAL "")
-set(toml11_TEST_WITH_ASAN OFF CACHE INTERNAL "")
-set(toml11_TEST_WITH_UBSAN OFF CACHE INTERNAL "")
-set(toml11_INSTALL OFF CACHE INTERNAL "")
-add_subdirectory(ThirdParty/toml EXCLUDE_FROM_ALL)
+endif()
 
 # -------------------------------------------------------------
 # options for enabling specific core communication types
@@ -616,45 +490,8 @@ if(NOT HELICS_DISABLE_ASIO)
         INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty/asio/asio/include>
     )
 endif()
-# -------------------------------------------------------------
-# setting the RPATH
-# -------------------------------------------------------------
-if(NOT DEFINED CMAKE_MACOSX_RPATH)
-    set(CMAKE_MACOSX_RPATH ON)
-endif()
-
-# add the automatically determined parts of the RPATH which point to directories outside the build
-# tree to the install RPATH
-if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
-    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif()
-
-# Add the local directory to the rpath
-if(NOT APPLE)
-    list(APPEND CMAKE_INSTALL_RPATH $ORIGIN)
-    list(APPEND CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-else()
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path")
-    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR}")
-    list(APPEND CMAKE_INSTALL_RPATH "@executable_path")
-    list(APPEND CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}")
-endif()
-
-# the RPATH to be used when installing, but only if it's not a system directory
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-     "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" isSystemDir
-)
-if(isSystemDir STREQUAL "-1")
-    list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
-endif()
-
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-     "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir
-)
-if(isSystemDir STREQUAL "-1")
-    list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-endif()
 
+include(commonRPath)
 if(NOT WIN32)
     if(HELICS_ENABLE_ZMQ_CORE AND NOT HELICS_USE_ZMQ_STATIC_LIBRARY)
         get_target_property(zmqlibfile libzmq IMPORTED_LOCATION)
@@ -684,9 +521,6 @@ include(addfmt)
 # Create the target for jsoncpp
 # -----------------------------------------------------------
 include(addJsoncpp)
-if(TARGET jsoncpp_static AND NOT TARGET JsonCpp::JsonCpp)
-    add_library(HELICS::jsoncpp ALIAS jsoncpp_static)
-endif()
 
 # --------------------------------------------------------------
 # Create the target for spdlog
@@ -701,64 +535,13 @@ include(addUnits)
 # -----------------------------------------------------------------------------
 # create utilities target
 # -----------------------------------------------------------------------------
-
-set(GMLC_UTILITIES_INSTALL OFF CACHE INTERNAL "")
-
-add_subdirectory(ThirdParty/utilities)
-
-hide_variable(GMLC_UTILITIES_GENERATE_DOXYGEN_DOC)
-hide_variable(GMLC_UTILITIES_INCLUDE_BOOST)
-hide_variable(GMLC_UTILITIES_USE_BOOST_SPIRIT)
-hide_variable(GMLC_UTILITIES_WITH_CMAKE_PACKAGE)
-hide_variable(GMLC_UTILITIES_OBJECT_LIB)
-hide_variable(GMLC_UTILITIES_STATIC_LIB)
-hide_variable(GMLC_UTILITIES_CLANG_TIDY_OPTIONS)
-
-target_compile_definitions(gmlc_utilities PUBLIC USE_STD_STRING_VIEW=1)
-
-set_target_properties(gmlc_utilities PROPERTIES FOLDER Extern)
-if(NOT HELICS_DISABLE_BOOST)
-    target_include_directories(
-        gmlc_utilities SYSTEM PRIVATE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
-    )
-endif()
+include(addUtilities)
 
 # -----------------------------------------------------------------------------
 # create networking target
 # -----------------------------------------------------------------------------
 
-set(GMLC_NETWORKING_INSTALL OFF CACHE INTERNAL "")
-set(GMLC_NETWORKING_ASIO_INCLUDE ${PROJECT_SOURCE_DIR}/ThirdParty/asio/asio/include)
-set(GMLC_NETWORKING_CONCURRENCY_INCLUDE ${PROJECT_SOURCE_DIR}/ThirdParty/concurrency)
-set(GMLC_NETWORKING_DISABLE_ASIO ${HELICS_DISABLE_ASIO} CACHE INTERNAL "")
-
-# hide some of the JSON in the networking library
-set(JSON_CI OFF CACHE INTERNAL "")
-set(JSON_Diagnostics OFF CACHE INTERNAL "")
-set(JSON_ImplicitConversions ON CACHE INTERNAL "")
-set(JSON_Install OFF CACHE INTERNAL "")
-set(JSON_MultipleHeaders OFF CACHE INTERNAL "")
-set(JSON_SystemInclude OFF CACHE INTERNAL "")
-
-if(HELICS_ENABLE_ENCRYPTION)
-    list(APPEND VCPKG_MANIFEST_FEATURES "encryption")
-    set(GMLC_NETWORKING_ENABLE_ENCRYPTION ON CACHE INTERNAL "")
-else()
-    set(GMLC_NETWORKING_ENABLE_ENCRYPTION OFF CACHE INTERNAL "")
-endif()
-
-add_subdirectory(ThirdParty/networking)
-
-hide_variable(GMLC_NETWORKING_GENERATE_DOXYGEN_DOC)
-hide_variable(GMLC_NETWORKING_INCLUDE_BOOST)
-hide_variable(GMLC_NETWORKING_WITH_CMAKE_PACKAGE)
-hide_variable(GMLC_NETWORKING_OBJECT_LIB)
-hide_variable(GMLC_NETWORKING_STATIC_LIB)
-hide_variable(GMLC_NETWORKING_CLANG_TIDY_OPTIONS)
-hide_variable(GMLC_NETWORKING_ENABLE_SUBMODULE_UPDATE)
-hide_variable(GMLC_NETWORKING_USE_EXTERNAL_JSON)
-
-set_target_properties(gmlc_networking PROPERTIES FOLDER Extern)
+include(addNetworking)
 
 # -----------------------------------------------------------------------------
 # CMAKE Subdirectories
@@ -1038,12 +821,10 @@ if(HELICS_ENABLE_PACKAGE_BUILD)
         headers
         libs
         swig
-        matlab
         java
         octave
         csharp
         benchmarks
-        cereal
     )
     if(WIN32)
         set(CPACK_RESOURCE_FILE_LICENSE "${HELICS_SOURCE_DIR}\\\\LICENSE")
@@ -1166,10 +947,46 @@ endif(HELICS_ENABLE_PACKAGE_BUILD)
 
 if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     # restore the original module path
-    set(CMAKE_MODULE_PATH ${ORIGINAL_MODULE_PATH})
+    set(CMAKE_MODULE_PATH ${${PROJECT_NAME}_ORIGINAL_MODULE_PATH})
     if(old_build_shared)
         set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
     endif()
+
+    if(HELICS_HIDE_CMAKE_VARIABLES)
+        hide_variable(HELICS_BINARY_ONLY_INSTALL)
+        hide_variable(HELICS_BUILD_APP_LIBRARY)
+        hide_variable(HELICS_BUILD_CONFIGURATION)
+        hide_variable(HELICS_BUILD_CXX_SHARED_LIB)
+        hide_variable(HELICS_DISABLE_ASIO)
+        hide_variable(HELICS_DISABLE_BOOST)
+        hide_variable(HELICS_DISABLE_C_SHARED_LIB)
+        hide_variable(HELICS_DISABLE_WEBSERVER)
+        hide_variable(HELICS_DISABLE_VCPKG)
+        hide_variable(HELICS_ENABLE_DEBUG_LOGGING)
+        hide_variable(HELICS_ENABLE_ENCRYPTION)
+        hide_variable(HELICS_ENABLE_INPROC_CORE)
+        hide_variable(HELICS_ENABLE_LOGGING)
+        hide_variable(HELICS_ENABLE_IPC_CORE)
+        hide_variable(HELICS_ENABLE_MPI_CORE)
+        hide_variable(HELICS_ENABLE_TRACE_LOGGING)
+        hide_variable(HELICS_ENABLE_PYTHON_BUILD_SCRIPTS)
+        hide_variable(HELICS_ENABLE_TEST_CORE)
+        hide_variable(HELICS_ENABLE_ZMQ_CORE)
+        hide_variable(HELICS_ENABLE_UDP_CORE)
+        hide_variable(HELICS_ENABLE_SUBMODULE_UPDATE)
+        hide_variable(HELICS_ENABLE_TCP_CORE)
+        hide_variable(HELICS_ENABLE_MPI_CORE)
+
+        hide_variable(HELICS_USE_EXTERNAL_FMT)
+        hide_variable(HELICS_USE_EXTERNAL_JSONCPP)
+        hide_variable(HELICS_USE_EXTERNAL_SPDLOG)
+        hide_variable(HELICS_USE_EXTERNAL_UNITS)
+        hide_variable(HELICS_USE_POSITION_INDEPENDENT_CODE)
+        hide_variable(HELICS_USE_SYSTEM_ZEROMQ_ONLY)
+        hide_variable(HELICS_USE_ZMQ_STATIC_LIBRARY)
+        hide_variable(HELICS_ZMQ_FORCE_SUBPROJECT)
+        hide_variable(HELICS_ZMQ_SUBPROJECT)
+    endif()
 endif()
 
 # -------------------------------------------------------------
diff --git a/config/cmake/AddGooglebenchmark.cmake b/config/cmake/AddGooglebenchmark.cmake
index 705e1257e0..ac11e9c092 100644
--- a/config/cmake/AddGooglebenchmark.cmake
+++ b/config/cmake/AddGooglebenchmark.cmake
@@ -15,8 +15,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.11)
     include(FetchContent)
 
     fetchcontent_declare(
-        gbenchmark
-        GIT_REPOSITORY https://github.com/google/benchmark.git
+        gbenchmark GIT_REPOSITORY https://github.com/google/benchmark.git
         GIT_TAG ${gbenchmark_version}
     )
 
@@ -54,13 +53,13 @@ endif()
 
 set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE INTERNAL "")
 set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "Suppressing benchmark's tests")
-set(BENCHMARK_ENABLE_INSTALL OFF CACHE INTERNAL "" )
+set(BENCHMARK_ENABLE_INSTALL OFF CACHE INTERNAL "")
 set(BENCHMARK_DOWNLOAD_DEPENDENCIES ON CACHE INTERNAL "")
 set(BENCHMARK_ENABLE_ASSEMBLY_TESTS OFF CACHE INTERNAL "")
 # tell google benchmarks to use std regex since we only compile on compilers with std regex
-set(HAVE_STD_REGEX ON CACHE INTERNAL "" )
-set(HAVE_POSIX_REGEX OFF CACHE INTERNAL "" )
-set(HAVE_GNU_POSIX_REGEX OFF CACHE INTERNAL "" )
+set(HAVE_STD_REGEX ON CACHE INTERNAL "")
+set(HAVE_POSIX_REGEX OFF CACHE INTERNAL "")
+set(HAVE_GNU_POSIX_REGEX OFF CACHE INTERNAL "")
 add_subdirectory(${${gbName}_SOURCE_DIR} ${${gbName}_BINARY_DIR} EXCLUDE_FROM_ALL)
 
 # Target must already exist
@@ -95,8 +94,6 @@ target_compile_options(benchmark_main PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244
 target_compile_options(benchmark PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4244 /wd4800>)
 
 if(MSVC)
-    target_compile_definitions(benchmark PUBLIC
-                               _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-    target_compile_definitions(benchmark_main PUBLIC
-                               _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+    target_compile_definitions(benchmark PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+    target_compile_definitions(benchmark_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
 endif()
diff --git a/config/cmake/AddGoogletest.cmake b/config/cmake/AddGoogletest.cmake
index fa25f1c20e..11272f6f47 100644
--- a/config/cmake/AddGoogletest.cmake
+++ b/config/cmake/AddGoogletest.cmake
@@ -8,64 +8,50 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #
-# Downloads GTest and provides a helper macro to add tests. Add make check, as well,
-# which gives output on failed tests without having to set an environment variable.
+# Downloads GTest and provides a helper macro to add tests. Add make check, as well, which gives
+# output on failed tests without having to set an environment variable.
 #
 
 set(gtest_version release-1.12.1)
 
-
 string(TOLOWER "googletest" gtName)
 
-    include(FetchContent)
-    mark_as_advanced(FETCHCONTENT_BASE_DIR)
-    mark_as_advanced(FETCHCONTENT_FULLY_DISCONNECTED)
-    mark_as_advanced(FETCHCONTENT_QUIET)
-    mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED)
-
-    fetchcontent_declare(
-        googletest
-        GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG ${gtest_version}
-        GIT_SHALLOW 1
-        UPDATE_COMMAND ""
-    )
-
-    fetchcontent_getproperties(googletest)
+include(FetchContent)
+mark_as_advanced(FETCHCONTENT_BASE_DIR)
+mark_as_advanced(FETCHCONTENT_FULLY_DISCONNECTED)
+mark_as_advanced(FETCHCONTENT_QUIET)
+mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED)
+
+fetchcontent_declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG ${gtest_version}
+    GIT_SHALLOW 1
+    UPDATE_COMMAND ""
+)
 
-    if(NOT ${gtName}_POPULATED)
-        # Fetch the content using previously declared details
-        fetchcontent_populate(googletest)
+fetchcontent_getproperties(googletest)
 
-    endif()
-    hide_variable(FETCHCONTENT_SOURCE_DIR_GOOGLETEST)
-    hide_variable(FETCHCONTENT_UPDATES_DISCONNECTED_GOOGLETEST)
+if(NOT ${gtName}_POPULATED)
+    # Fetch the content using previously declared details
+    fetchcontent_populate(googletest)
 
+endif()
+hide_variable(FETCHCONTENT_SOURCE_DIR_GOOGLETEST)
+hide_variable(FETCHCONTENT_UPDATES_DISCONNECTED_GOOGLETEST)
 
-set(gtest_force_shared_crt
-    ON
-    CACHE INTERNAL ""
-)
+set(gtest_force_shared_crt ON CACHE INTERNAL "")
 
-set(BUILD_SHARED_LIBS
-    OFF
-    CACHE INTERNAL ""
-)
-set(HAVE_STD_REGEX
-    ON
-    CACHE INTERNAL ""
-)
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "")
+set(HAVE_STD_REGEX ON CACHE INTERNAL "")
 
-set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS
-    1
-    CACHE INTERNAL ""
-)
+set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "")
 add_subdirectory(${${gtName}_SOURCE_DIR} ${${gtName}_BINARY_DIR} EXCLUDE_FROM_ALL)
 
 message(STATUS "loading google-test directory ${${gtName}_SOURCE_DIR}")
 if(NOT MSVC)
-    # target_Compile_options(gtest PRIVATE "-Wno-undef") target_Compile_options(gmock
-    # PRIVATE "-Wno-undef") target_Compile_options(gtest_main PRIVATE "-Wno-undef")
+    # target_Compile_options(gtest PRIVATE "-Wno-undef") target_Compile_options(gmock PRIVATE
+    # "-Wno-undef") target_Compile_options(gtest_main PRIVATE "-Wno-undef")
     # target_Compile_options(gmock_main PRIVATE "-Wno-undef")
 endif()
 
@@ -78,11 +64,7 @@ macro(add_gtest TESTNAME)
     target_link_libraries(${TESTNAME} PUBLIC gtest gmock gtest_main)
 
     if(GOOGLE_TEST_INDIVIDUAL)
-        gtest_discover_tests(
-            ${TESTNAME}
-            TEST_PREFIX "${TESTNAME}."
-            PROPERTIES FOLDER "Tests"
-        )
+        gtest_discover_tests(${TESTNAME} TEST_PREFIX "${TESTNAME}." PROPERTIES FOLDER "Tests")
     else()
         add_test(${TESTNAME} ${TESTNAME})
         set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests")
@@ -104,11 +86,7 @@ set_target_properties(gtest gtest_main gmock gmock_main PROPERTIES FOLDER "Exter
 if(MSVC)
     # add_compile_options( /wd4459)
     target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-    target_compile_definitions(
-        gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-    )
+    target_compile_definitions(gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
     target_compile_definitions(gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-    target_compile_definitions(
-        gmock_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-    )
+    target_compile_definitions(gmock_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
 endif()
diff --git a/config/cmake/BuildType.cmake b/config/cmake/BuildType.cmake
index 6cf6017ce7..3aa28acfd2 100644
--- a/config/cmake/BuildType.cmake
+++ b/config/cmake/BuildType.cmake
@@ -11,22 +11,10 @@
 set(default_build_type "Release")
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    message(
-        STATUS "Setting build type to '${default_build_type}' as none was specified."
-    )
-    set(
-        CMAKE_BUILD_TYPE
-        "${default_build_type}"
-        CACHE STRING "Choose the type of build." FORCE
-    )
+    message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
+    set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
     # Set the possible values of build type for cmake-gui
     set_property(
-        CACHE CMAKE_BUILD_TYPE
-        PROPERTY
-            STRINGS
-            "Debug"
-            "Release"
-            "MinSizeRel"
-            "RelWithDebInfo"
+        CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo"
     )
 endif()
diff --git a/config/cmake/CheckLatestCXXStandardOption.cmake b/config/cmake/CheckLatestCXXStandardOption.cmake
index 3e5cf47a2e..ab06cf38da 100644
--- a/config/cmake/CheckLatestCXXStandardOption.cmake
+++ b/config/cmake/CheckLatestCXXStandardOption.cmake
@@ -10,16 +10,16 @@
 include(CheckCXXCompilerFlag)
 
 if(NOT CMAKE_CXX_STANDARD)
-    if (${PROJECT_NAME}_CXX_STANDARD)
+    if(${PROJECT_NAME}_CXX_STANDARD)
         set(CMAKE_CXX_STANDARD ${PROJECT_NAME}_CXX_STANDARD)
     else()
         set(CMAKE_CXX_STANDARD 17)
     endif()
 endif()
 
-if (CMAKE_CXX_STANDARD LESS 17)
+if(CMAKE_CXX_STANDARD LESS 17)
     message(FATAL_ERROR "{$PROJECT_NAME} requires C++17 or greater")
-endif ()
+endif()
 
 if(MSVC)
     if(CMAKE_CXX_STANDARD EQUAL 17)
@@ -65,10 +65,10 @@ else()
             endif()
         endif()
     elseif(CMAKE_CXX_STANDARD EQUAL 17)
-        if (CYGWIN AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if(CYGWIN AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             set(CXX_STANDARD_FLAG -std=gnu++17)
         else()
-           set(CXX_STANDARD_FLAG -std=c++17)
+            set(CXX_STANDARD_FLAG -std=c++17)
         endif()
 
     else()
diff --git a/config/cmake/FindZeroMQ.cmake b/config/cmake/FindZeroMQ.cmake
index 10e31eefda..a0d339e3d7 100644
--- a/config/cmake/FindZeroMQ.cmake
+++ b/config/cmake/FindZeroMQ.cmake
@@ -10,24 +10,22 @@
 #
 # Find the ZeroMQ includes and library
 #
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~
 # This module defines
 # ZeroMQ_INCLUDE_DIR, where to find zmq.h
 # ZeroMQ_LIBRARY, the library needed to use ZeroMQ
 # ZeroMQ_FOUND, if false, you cannot build anything that requires ZeroMQ.
 # ZeroMQ_SHARED_LIB the shared library that needs to be associated with the executable
 # adds targets for libzmq and libzmq-static
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~
 
 set(ZeroMQ_FOUND 0)
 
-set(
-    ZeroMQ_REGISTRY_PATH
+set(ZeroMQ_REGISTRY_PATH
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ZeroMQ (x64);DisplayIcon]"
 )
 
-# this is to deal with something weird when specifying the install path from an external
-# source
+# this is to deal with something weird when specifying the install path from an external source
 
 if("${ZeroMQ_INSTALL_PATH}" STREQUAL "")
     set(ZeroMQ_PATH2 "")
@@ -39,9 +37,7 @@ if(NOT ZeroMQ_LIBRARY_ONLY)
     find_path(
         ZeroMQ_ROOT_DIR
         NAMES include/zmq.h
-        HINTS
-            ${ZeroMQ_INCLUDE_PATH} ${ZeroMQ_REGISTRY_PATH} ${ZeroMQ_INSTALL_PATH}
-            ${ZeroMQ_PATH2}
+        HINTS ${ZeroMQ_INCLUDE_PATH} ${ZeroMQ_REGISTRY_PATH} ${ZeroMQ_INSTALL_PATH} ${ZeroMQ_PATH2}
         PATHS /usr /usr/local
     )
 
@@ -62,10 +58,8 @@ if(MSVC)
 
     # message(STATUS "toolset =${CMAKE_VS_PLATFORM_TOOLSET}")
 
-    if(${ZeroMQ_NAME} MATCHES "registry") # if key was not found, the string "registry"
-                                          # is returned
-        set(
-            _ZeroMQ_VERSIONS
+    if(${ZeroMQ_NAME} MATCHES "registry") # if key was not found, the string "registry" is returned
+        set(_ZeroMQ_VERSIONS
             "4_3_4"
             "4_3_3"
             "4_3_2"
@@ -87,29 +81,20 @@ if(MSVC)
         )
         set(ZeroMQ_LIBRARY_NAME)
         foreach(ver ${_ZeroMQ_VERSIONS})
-            list(
-                APPEND
-                    ZeroMQ_LIBRARY_NAME "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-${ver}"
-            )
+            list(APPEND ZeroMQ_LIBRARY_NAME "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-${ver}")
         endforeach()
         foreach(ver ${_ZeroMQ_VERSIONS})
-            list(
-                APPEND
-                    ZeroMQ_DEBUG_LIBRARY_NAME
-                    "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-gd-${ver}"
+            list(APPEND ZeroMQ_DEBUG_LIBRARY_NAME
+                 "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-gd-${ver}"
             )
         endforeach()
     else()
         # Format ZeroMQ library file name
         foreach(vs ${_VS_VERSIONS})
-            set(
-                ZeroMQ_LIBRARY_NAME
-                "libzmq-v${CMAKE_VS_PLATFORM_TOOLSET}-mt-${ZeroMQ_NAME}"
-            )
+            set(ZeroMQ_LIBRARY_NAME "libzmq-v${CMAKE_VS_PLATFORM_TOOLSET}-mt-${ZeroMQ_NAME}")
         endforeach()
         foreach(vs ${_VS_VERSIONS})
-            set(
-                ZeroMQ_DEBUG_LIBRARY_NAME
+            set(ZeroMQ_DEBUG_LIBRARY_NAME
                 "libzmq-v${CMAKE_VS_PLATFORM_TOOLSET}-mt-gd-${ZeroMQ_NAME}"
             )
         endforeach()
@@ -119,12 +104,8 @@ endif()
 find_library(
     ZeroMQ_LIBRARY
     NAMES zmq libzmq ${ZeroMQ_LIBRARY_NAME}
-    HINTS
-        "${ZeroMQ_LIBRARY_PATH}"
-        "${ZeroMQ_ROOT_DIR}/lib"
-        "${ZeroMQ_INSTALL_PATH}/lib"
-        "${ZeroMQ_INSTALL_PATH}/bin"
-        ${ZeroMQ_PATH2}/lib
+    HINTS "${ZeroMQ_LIBRARY_PATH}" "${ZeroMQ_ROOT_DIR}/lib" "${ZeroMQ_INSTALL_PATH}/lib"
+          "${ZeroMQ_INSTALL_PATH}/bin" ${ZeroMQ_PATH2}/lib
     PATHS /lib /usr/lib /usr/local/lib
 )
 
@@ -132,12 +113,8 @@ if(MSVC)
     find_library(
         ZeroMQ_DEBUG_LIBRARY
         NAMES ${ZeroMQ_DEBUG_LIBRARY_NAME}
-        HINTS
-            "${ZeroMQ_LIBRARY_PATH}"
-            "${ZeroMQ_ROOT_DIR}/lib"
-            "${ZeroMQ_INSTALL_PATH}/lib"
-            "${ZeroMQ_INSTALL_PATH}/bin"
-            ${ZeroMQ_PATH2}/lib
+        HINTS "${ZeroMQ_LIBRARY_PATH}" "${ZeroMQ_ROOT_DIR}/lib" "${ZeroMQ_INSTALL_PATH}/lib"
+              "${ZeroMQ_INSTALL_PATH}/bin" ${ZeroMQ_PATH2}/lib
         PATHS /lib /usr/lib /usr/local/lib
     )
 endif()
@@ -145,28 +122,22 @@ endif()
 find_library(
     ZeroMQ_STATIC_LIBRARY
     NAMES zmq.a libzmq.a ${ZeroMQ_LIBRARY_NAME}.a
-    HINTS
-        "${ZeroMQ_LIBRARY_PATH}"
-        "${ZeroMQ_ROOT_DIR}/lib"
-        "${ZeroMQ_INSTALL_PATH}/lib"
-        "${ZeroMQ_INSTALL_PATH}/bin"
-        ${ZeroMQ_PATH2}/lib
+    HINTS "${ZeroMQ_LIBRARY_PATH}" "${ZeroMQ_ROOT_DIR}/lib" "${ZeroMQ_INSTALL_PATH}/lib"
+          "${ZeroMQ_INSTALL_PATH}/bin" ${ZeroMQ_PATH2}/lib
     PATHS /lib /usr/lib /usr/local/lib
 )
 
 if(ZeroMQ_REQUIRE_HEADERS)
     if(ZeroMQ_INCLUDE_DIR)
-        if(
-            (ZeroMQ_LIBRARY AND NOT ZeroMQ_LIBRARY-NOTFOUND)
-            OR (ZeroMQ_STATIC_LIBRARY AND NOT ZeroMQ_STATIC_LIBRARY-NOTFOUND)
+        if((ZeroMQ_LIBRARY AND NOT ZeroMQ_LIBRARY-NOTFOUND)
+           OR (ZeroMQ_STATIC_LIBRARY AND NOT ZeroMQ_STATIC_LIBRARY-NOTFOUND)
         )
             set(ZeroMQ_FOUND 1)
         endif()
     endif()
 else(ZeroMQ_REQUIRE_HEADERS)
-    if(
-        (ZeroMQ_LIBRARY AND NOT ZeroMQ_LIBRARY-NOTFOUND)
-        OR (ZeroMQ_STATIC_LIBRARY AND NOT ZeroMQ_STATIC_LIBRARY-NOTFOUND)
+    if((ZeroMQ_LIBRARY AND NOT ZeroMQ_LIBRARY-NOTFOUND) OR (ZeroMQ_STATIC_LIBRARY
+                                                            AND NOT ZeroMQ_STATIC_LIBRARY-NOTFOUND)
     )
         set(ZeroMQ_FOUND 1)
     endif()
@@ -176,29 +147,21 @@ if(ZeroMQ_FOUND)
     # Create shared library target
     if(ZeroMQ_LIBRARY AND NOT ZeroMQ_LIBRARY-NOTFOUND)
         message(STATUS "Found ZeroMQ library: ${ZeroMQ_LIBRARY}")
-        # this is static because we are pointing to the library for the linker, not the
-        # shared object
+        # this is static because we are pointing to the library for the linker, not the shared
+        # object
         add_library(libzmq STATIC IMPORTED)
         if(ZeroMQ_DEBUG_LIBRARY)
+            set_target_properties(libzmq PROPERTIES IMPORTED_LOCATION_RELEASE "${ZeroMQ_LIBRARY}")
             set_target_properties(
-                libzmq
-                PROPERTIES IMPORTED_LOCATION_RELEASE "${ZeroMQ_LIBRARY}"
-            )
-            set_target_properties(
-                libzmq
-                PROPERTIES IMPORTED_LOCATION_DEBUG "${ZeroMQ_DEBUG_LIBRARY}"
+                libzmq PROPERTIES IMPORTED_LOCATION_DEBUG "${ZeroMQ_DEBUG_LIBRARY}"
             )
         else(ZeroMQ_DEBUG_LIBRARY)
-            set_target_properties(
-                libzmq
-                PROPERTIES IMPORTED_LOCATION "${ZeroMQ_LIBRARY}"
-            )
+            set_target_properties(libzmq PROPERTIES IMPORTED_LOCATION "${ZeroMQ_LIBRARY}")
         endif(ZeroMQ_DEBUG_LIBRARY)
         if(ZeroMQ_INCLUDE_DIR)
             message(STATUS "Found ZeroMQ headers: ${ZeroMQ_INCLUDE_DIR}")
             set_target_properties(
-                libzmq
-                PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZeroMQ_INCLUDE_DIR}"
+                libzmq PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZeroMQ_INCLUDE_DIR}"
             )
         endif()
     else()
@@ -213,14 +176,10 @@ if(ZeroMQ_FOUND)
     # Create static library target
     if(ZeroMQ_STATIC_LIBRARY AND NOT ZeroMQ_STATIC_LIBRARY-NOTFOUND)
         add_library(libzmq-static STATIC IMPORTED)
-        set_target_properties(
-            libzmq-static
-            PROPERTIES IMPORTED_LOCATION "${ZeroMQ_STATIC_LIBRARY}"
-        )
+        set_target_properties(libzmq-static PROPERTIES IMPORTED_LOCATION "${ZeroMQ_STATIC_LIBRARY}")
         if(ZeroMQ_INCLUDE_DIR)
             set_target_properties(
-                libzmq-static
-                PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZeroMQ_INCLUDE_DIR}"
+                libzmq-static PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZeroMQ_INCLUDE_DIR}"
             )
         endif()
     endif()
@@ -228,9 +187,5 @@ endif()
 
 # show the variables only in the advanced view
 mark_as_advanced(
-    ZeroMQ_ROOT_DIR
-    ZeroMQ_INCLUDE_DIR
-    ZeroMQ_LIBRARY
-    ZeroMQ_STATIC_LIBRARY
-    ZeroMQ_FOUND
+    ZeroMQ_ROOT_DIR ZeroMQ_INCLUDE_DIR ZeroMQ_LIBRARY ZeroMQ_STATIC_LIBRARY ZeroMQ_FOUND
 )
diff --git a/config/cmake/addBoost.cmake b/config/cmake/addBoost.cmake
index 01dfdd2d34..e091a9aee6 100644
--- a/config/cmake/addBoost.cmake
+++ b/config/cmake/addBoost.cmake
@@ -13,8 +13,7 @@ mark_as_advanced(BOOST_INSTALL_PATH)
 
 if(WIN32 AND NOT UNIX_LIKE)
 
-    set(
-        boost_versions
+    set(boost_versions
         boost_1_80_0
         boost_1_79_0
         boost_1_78_0
@@ -31,8 +30,7 @@ if(WIN32 AND NOT UNIX_LIKE)
         boost_1_67_0
     )
 
-    set(
-        poss_prefixes
+    set(poss_prefixes
         C:
         C:/local
         C:/boost
@@ -92,11 +90,7 @@ endif()
 set(BOOST_MINIMUM_VERSION 1.67)
 
 if(BOOST_REQUIRED_LIBRARIES)
-    find_package(
-        Boost ${BOOST_MINIMUM_VERSION}
-        COMPONENTS ${BOOST_REQUIRED_LIBRARIES}
-        REQUIRED
-    )
+    find_package(Boost ${BOOST_MINIMUM_VERSION} COMPONENTS ${BOOST_REQUIRED_LIBRARIES} REQUIRED)
 else()
     find_package(Boost ${BOOST_MINIMUM_VERSION})
 endif()
@@ -159,8 +153,8 @@ else()
     if(NOT TARGET Boostlibs::test)
         add_library(Boostlibs::test UNKNOWN IMPORTED)
     endif()
-    # if(MINGW) set_property(TARGET Boostlibs::core PROPERTY
-    # INTERFACE_COMPILE_DEFINTIONS BOOST_USE_WINDOWS_H) endif()
+    # if(MINGW) set_property(TARGET Boostlibs::core PROPERTY INTERFACE_COMPILE_DEFINTIONS
+    # BOOST_USE_WINDOWS_H) endif()
 endif()
 
 list(LENGTH Boost_LIBRARIES_core_debug core_debug_size)
@@ -180,20 +174,15 @@ if(core_debug_size EQUAL 0)
         else()
             add_library(Boostlibs::${rand_name} UNKNOWN IMPORTED)
         endif()
-        set_target_properties(
-            Boostlibs::${rand_name}
-            PROPERTIES IMPORTED_LOCATION ${next_lib}
-        )
+        set_target_properties(Boostlibs::${rand_name} PROPERTIES IMPORTED_LOCATION ${next_lib})
         list(APPEND boost_core_deps Boostlibs::${rand_name})
     endforeach()
 else()
     list(GET Boost_LIBRARIES_core_release 0 first_lib_r)
     list(GET Boost_LIBRARIES_core_debug 0 first_lib_d)
     set_target_properties(
-        Boostlibs::core
-        PROPERTIES
-            IMPORTED_LOCATION_DEBUG ${first_lib_d} IMPORTED_LOCATION_RELEASE
-            ${first_lib_r}
+        Boostlibs::core PROPERTIES IMPORTED_LOCATION_DEBUG ${first_lib_d} IMPORTED_LOCATION_RELEASE
+                                                                          ${first_lib_r}
     )
 
     foreach(item RANGE 1 ${rng})
@@ -206,10 +195,8 @@ else()
             add_library(Boostlibs::${rand_name} UNKNOWN IMPORTED)
         endif()
         set_target_properties(
-            Boostlibs::${rand_name}
-            PROPERTIES
-                IMPORTED_LOCATION_DEBUG ${next_lib_d} IMPORTED_LOCATION_RELEASE
-                ${next_lib_r}
+            Boostlibs::${rand_name} PROPERTIES IMPORTED_LOCATION_DEBUG ${next_lib_d}
+                                               IMPORTED_LOCATION_RELEASE ${next_lib_r}
         )
         list(APPEND boost_core_deps Boostlibs::${rand_name})
     endforeach()
@@ -217,29 +204,23 @@ endif()
 
 if(Boost_INCLUDE_DIR)
     set_target_properties(
-        Boostlibs::core Boostlibs::test
-        PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR}
+        Boostlibs::core Boostlibs::test PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
+                                                   ${Boost_INCLUDE_DIR}
     )
 endif()
 if(BOOST_REQUIRED_LIBRARIES)
-    set_target_properties(
-        Boostlibs::core
-        PROPERTIES INTERFACE_LINK_LIBRARIES "${boost_core_deps}"
-    )
+    set_target_properties(Boostlibs::core PROPERTIES INTERFACE_LINK_LIBRARIES "${boost_core_deps}")
 
     if(Boost_LIBRARIES_test_debug)
         set_target_properties(
-            Boostlibs::test
-            PROPERTIES
-                IMPORTED_LOCATION_DEBUG "${Boost_LIBRARIES_test_debug}"
-                IMPORTED_LOCATION_RELEASE "${Boost_LIBRARIES_test_release}"
+            Boostlibs::test PROPERTIES IMPORTED_LOCATION_DEBUG "${Boost_LIBRARIES_test_debug}"
+                                       IMPORTED_LOCATION_RELEASE "${Boost_LIBRARIES_test_release}"
         )
     else()
         set_target_properties(
-            Boostlibs::test
-            PROPERTIES IMPORTED_LOCATION "${Boost_LIBRARIES_test_release}"
+            Boostlibs::test PROPERTIES IMPORTED_LOCATION "${Boost_LIBRARIES_test_release}"
         )
     endif()
 endif()
-# message(STATUS "Using Boost core debug libraries : ${Boost_LIBRARIES_core_debug}")
-# message(STATUS "Using Boost core release libraries : ${Boost_LIBRARIES_core_release}")
+# message(STATUS "Using Boost core debug libraries : ${Boost_LIBRARIES_core_debug}") message(STATUS
+# "Using Boost core release libraries : ${Boost_LIBRARIES_core_release}")
diff --git a/config/cmake/addGitHooks.cmake b/config/cmake/addGitHooks.cmake
index dbb075d3e7..3bc5883f15 100644
--- a/config/cmake/addGitHooks.cmake
+++ b/config/cmake/addGitHooks.cmake
@@ -12,78 +12,86 @@ set(CLANG_FORMAT_MIN_VERSION "7.0")
 
 function(set_git_hooks_enabled)
     execute_process(
-            COMMAND ${GIT_EXECUTABLE} config --local core.hooksPath .githooks
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        COMMAND ${GIT_EXECUTABLE} config --local core.hooksPath .githooks
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     )
     message(STATUS "Git hooks enabled")
 endfunction()
 
 function(set_git_hooks_disabled)
     execute_process(
-            COMMAND ${GIT_EXECUTABLE} config --local --unset core.hooksPath
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        COMMAND ${GIT_EXECUTABLE} config --local --unset core.hooksPath
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     )
     message(STATUS "Git hooks disabled")
 endfunction()
 
-if (NOT DEFINED CLANG_FORMAT)
+if(NOT DEFINED CLANG_FORMAT)
     find_program(CLANG_FORMAT clang-format)
-endif ()
+endif()
 
-if (CLANG_FORMAT)
-    execute_process(COMMAND ${CLANG_FORMAT} -version
-            OUTPUT_VARIABLE CLANG_FORMAT_VERSION
-            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif ()
+if(CLANG_FORMAT)
+    execute_process(
+        COMMAND ${CLANG_FORMAT} -version OUTPUT_VARIABLE CLANG_FORMAT_VERSION
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+endif()
 
-if (CLANG_FORMAT_VERSION MATCHES "^clang-format version .*")
-    string(REGEX
-            REPLACE "clang-format version ([.0-9]+).*"
-            "\\1"
-            CLANG_FORMAT_VERSION
-            "${CLANG_FORMAT_VERSION}")
+if(CLANG_FORMAT_VERSION MATCHES "^clang-format version .*")
+    string(REGEX REPLACE "clang-format version ([.0-9]+).*" "\\1" CLANG_FORMAT_VERSION
+                         "${CLANG_FORMAT_VERSION}"
+    )
 
-    if (NOT CLANG_FORMAT_VERSION VERSION_LESS ${CLANG_FORMAT_MIN_VERSION})
+    if(NOT CLANG_FORMAT_VERSION VERSION_LESS ${CLANG_FORMAT_MIN_VERSION})
         set(CLANG_FORMAT_VERSION_OK ON)
-    endif ()
-else ()
+    endif()
+else()
     set(CLANG_FORMAT_VERSION_OK OFF)
-endif ()
+endif()
 
 mark_as_advanced(CLANG_FORMAT)
 
-if (HELICS_ENABLE_GIT_HOOKS AND NOT CLANG_FORMAT_VERSION_OK)
-    message(WARNING
+if(HELICS_ENABLE_GIT_HOOKS AND NOT CLANG_FORMAT_VERSION_OK)
+    message(
+        WARNING
             "HELICS git hooks require clang-format version ${CLANG_FORMAT_MIN_VERSION} or higher.\n"
             "Install or update clang-format to use git hooks.\n"
-            "To select a different clang-format executable, update the CLANG_FORMAT property in CMake.")
-endif ()
+            "To select a different clang-format executable, update the CLANG_FORMAT property in CMake."
+    )
+endif()
 
-if (EXISTS "${PROJECT_SOURCE_DIR}/.git")
+if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
     set(GIT_REPO_FOUND ON)
-else ()
+else()
     set(GIT_REPO_FOUND OFF)
-endif ()
+endif()
 
-if (WIN32)
-    #there are a lot of potential issues doing this on windows, but the option should be available if desired
-    cmake_dependent_advanced_option(HELICS_ENABLE_GIT_HOOKS "Activate git hooks to run clang-format on committed files." OFF "GIT_REPO_FOUND;CLANG_FORMAT;CLANG_FORMAT_VERSION_OK" OFF)
+if(WIN32)
+    # there are a lot of potential issues doing this on windows, but the option should be available
+    # if desired
+    cmake_dependent_advanced_option(
+        HELICS_ENABLE_GIT_HOOKS "Activate git hooks to run clang-format on committed files." OFF
+        "GIT_REPO_FOUND;CLANG_FORMAT;CLANG_FORMAT_VERSION_OK" OFF
+    )
 else()
-    cmake_dependent_advanced_option(HELICS_ENABLE_GIT_HOOKS "Activate git hooks to run clang-format on committed files." ON "GIT_REPO_FOUND;CLANG_FORMAT;CLANG_FORMAT_VERSION_OK" OFF)
+    cmake_dependent_advanced_option(
+        HELICS_ENABLE_GIT_HOOKS "Activate git hooks to run clang-format on committed files." ON
+        "GIT_REPO_FOUND;CLANG_FORMAT;CLANG_FORMAT_VERSION_OK" OFF
+    )
 endif()
 
 find_package(Git)
 
-if (GIT_FOUND AND NOT GIT_VERSION_STRING VERSION_LESS "2.9")
-    if (HELICS_ENABLE_GIT_HOOKS AND GIT_REPO_FOUND)
+if(GIT_FOUND AND NOT GIT_VERSION_STRING VERSION_LESS "2.9")
+    if(HELICS_ENABLE_GIT_HOOKS AND GIT_REPO_FOUND)
         set_git_hooks_enabled()
-    elseif (GIT_REPO_FOUND)
+    elseif(GIT_REPO_FOUND)
         set_git_hooks_disabled()
     else()
         message(STATUS "Directory is not a Git repository. Git hooks are disabled automatically.")
-    endif ()
-elseif (HELICS_ENABLE_GIT_HOOKS AND GIT_FOUND AND GIT_VERSION_STRING VERSION_LESS "2.9")
+    endif()
+elseif(HELICS_ENABLE_GIT_HOOKS AND GIT_FOUND AND GIT_VERSION_STRING VERSION_LESS "2.9")
     message(WARNING "Git version earlier than 2.9 found, update Git to enable git hooks.")
-elseif (HELICS_ENABLE_GIT_HOOKS AND NOT GIT_FOUND)
+elseif(HELICS_ENABLE_GIT_HOOKS AND NOT GIT_FOUND)
     message(WARNING "Git not found, git hooks will not be enabled.")
-endif ()
+endif()
diff --git a/config/cmake/addJsoncpp.cmake b/config/cmake/addJsoncpp.cmake
index 7b69ee99ca..6071ae406e 100644
--- a/config/cmake/addJsoncpp.cmake
+++ b/config/cmake/addJsoncpp.cmake
@@ -7,81 +7,89 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-option(${PROJECT_NAME}_USE_EXTERNAL_JSONCPP "Use external copy of JsonCpp" OFF)
-mark_as_advanced(${PROJECT_NAME}_USE_EXTERNAL_JSONCPP)
-
-if(${PROJECT_NAME}_USE_EXTERNAL_JSONCPP)
-    # NOTE: static jsoncpp should be built with CMAKE_POSITION_INDEPENDENT_CODE
-    find_package(jsoncpp REQUIRED)
-else()
-    set(JSONCPP_WITH_TESTS OFF CACHE INTERNAL "")
-    set(JSONCPP_WITH_CMAKE_PACKAGE OFF CACHE INTERNAL "")
-    set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE INTERNAL "")
-    set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE INTERNAL "")
-    set(JSONCPP_WITH_WARNING_AS_ERROR OFF CACHE INTERNAL "")
-    set(DEBUG_LIBNAME_SUFFIX ${CMAKE_DEBUG_POSTFIX} CACHE INTERNAL "")
-
-    if(MSVC)
-        if(STATIC_STANDARD_LIB STREQUAL "default")
-            set(JSONCPP_STATIC_WINDOWS_RUNTIME OFF CACHE INTERNAL "")
-        elseif(STATIC_STANDARD_LIB STREQUAL "static")
-            set(JSONCPP_STATIC_WINDOWS_RUNTIME OFF CACHE INTERNAL "")
-        elseif(STATIC_STANDARD_LIB STREQUAL "dynamic")
-            set(JSONCPP_STATIC_WINDOWS_RUNTIME OFF CACHE INTERNAL "")
+if(NOT TARGET JsonCpp::JsonCpp)
+    option(${PROJECT_NAME}_USE_EXTERNAL_JSONCPP "Use external copy of JsonCpp" OFF)
+    mark_as_advanced(${PROJECT_NAME}_USE_EXTERNAL_JSONCPP)
+
+    if(${PROJECT_NAME}_USE_EXTERNAL_JSONCPP)
+        # NOTE: static jsoncpp should be built with CMAKE_POSITION_INDEPENDENT_CODE
+        find_package(jsoncpp REQUIRED)
+    else()
+        set(JSONCPP_WITH_TESTS OFF CACHE INTERNAL "")
+        set(JSONCPP_WITH_CMAKE_PACKAGE OFF CACHE INTERNAL "")
+        set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE INTERNAL "")
+        set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE INTERNAL "")
+        set(JSONCPP_WITH_WARNING_AS_ERROR OFF CACHE INTERNAL "")
+        set(DEBUG_LIBNAME_SUFFIX ${CMAKE_DEBUG_POSTFIX} CACHE INTERNAL "")
+
+        if(MSVC)
+            if(STATIC_STANDARD_LIB STREQUAL "default")
+                set(JSONCPP_STATIC_WINDOWS_RUNTIME OFF CACHE INTERNAL "")
+            elseif(STATIC_STANDARD_LIB STREQUAL "static")
+                set(JSONCPP_STATIC_WINDOWS_RUNTIME OFF CACHE INTERNAL "")
+            elseif(STATIC_STANDARD_LIB STREQUAL "dynamic")
+                set(JSONCPP_STATIC_WINDOWS_RUNTIME OFF CACHE INTERNAL "")
+            endif()
         endif()
-    endif()
 
-    # so json cpp exports to the correct target export
-    set(INSTALL_EXPORT "" CACHE INTERNAL "")
+        # so json cpp exports to the correct target export
+        set(INSTALL_EXPORT "" CACHE INTERNAL "")
 
-    set(JSONCPP_DISABLE_CCACHE ON CACHE INTERNAL "")
+        set(JSONCPP_DISABLE_CCACHE ON CACHE INTERNAL "")
 
-    if(NOT CMAKE_CXX_STANDARD)
-        set(CMAKE_CXX_STANDARD 17) # Supported values are ``17``, ``20``, and ``23``.
-    endif()
+        if(NOT CMAKE_CXX_STANDARD)
+            set(CMAKE_CXX_STANDARD 17) # Supported values are ``17``, ``20``, and ``23``.
+        endif()
 
-    if(BUILD_SHARED_LIBS)
-        set(OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-        set(BUILD_SHARED_LIBS OFF)
-    endif()
+        if(BUILD_SHARED_LIBS)
+            set(OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+            set(BUILD_SHARED_LIBS OFF)
+        endif()
 
-    if(BUILD_STATIC_LIBS)
-        set(OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
-        set(BUILD_STATIC_LIBS ON)
-    endif()
+        if(BUILD_STATIC_LIBS)
+            set(OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
+            set(BUILD_STATIC_LIBS ON)
+        endif()
 
-    if(BUILD_OBJECT_LIBS)
-        set(OLD_BUILD_OBJECT_LIBS ${BUILD_OBJECT_LIBS})
-        set(BUILD_OBJECT_LIBS OFF)
-    endif()
+        if(BUILD_OBJECT_LIBS)
+            set(OLD_BUILD_OBJECT_LIBS ${BUILD_OBJECT_LIBS})
+            set(BUILD_OBJECT_LIBS OFF)
+        endif()
 
-    # these are internal variables used in JSONCPP that we know to be true based on the
-    # requirements in HELICS for newer compilers than JSONCPP supports
-    set(HAVE_CLOCALE ON)
-    set(HAVE_LOCALECONV ON)
-    set(COMPILER_HAS_DEPRECATED ON)
-    set(HAVE_STDINT_H ON)
-    set(HAVE_DECIMAL_POINT ON)
-    add_subdirectory("${PROJECT_SOURCE_DIR}/ThirdParty/json_cpp"
-                     "${PROJECT_BINARY_DIR}/ThirdParty/json_cpp" EXCLUDE_FROM_ALL)
+        # these are internal variables used in JSONCPP that we know to be true based on the
+        # requirements in HELICS for newer compilers than JSONCPP supports
+        set(HAVE_CLOCALE ON)
+        set(HAVE_LOCALECONV ON)
+        set(COMPILER_HAS_DEPRECATED ON)
+        set(HAVE_STDINT_H ON)
+        set(HAVE_DECIMAL_POINT ON)
+        add_subdirectory(
+            "${PROJECT_SOURCE_DIR}/ThirdParty/json_cpp" "${PROJECT_BINARY_DIR}/ThirdParty/json_cpp"
+            EXCLUDE_FROM_ALL
+        )
+
+        set_target_properties(jsoncpp_static PROPERTIES FOLDER Extern)
+
+        if(OLD_BUILD_SHARED_LIBS)
+            set(BUILD_SHARED_LIBS ${OLD_BUILD_SHARED_LIBS})
+        endif()
 
+        if(OLD_BUILD_STATIC_LIBS)
+            set(BUILD_STATIC_LIBS ${OLD_BUILD_STATIC_LIBS})
+        endif()
 
-    set_target_properties(jsoncpp_static PROPERTIES FOLDER Extern)
+        if(OLD_BUILD_OBJECT_LIBS)
+            set(BUILD_OBJECT_LIBS ${OLD_BUILD_OBJECT_LIBS})
+        endif()
 
-    if(OLD_BUILD_SHARED_LIBS)
-        set(BUILD_SHARED_LIBS ${OLD_BUILD_SHARED_LIBS})
-    endif()
+        hide_variable(JSONCPP_WITH_STRICT_ISO)
+        hide_variable(DEBUG_LIBNAME_SUFFIX)
+        hide_variable(JSONCPP_USE_SECURE_MEMORY)
+        hide_variable(JSONCPP_WITH_EXAMPLE)
 
-    if(OLD_BUILD_STATIC_LIBS)
-        set(BUILD_STATIC_LIBS ${OLD_BUILD_STATIC_LIBS})
-    endif()
+        if(NOT TARGET JsonCpp::JsonCpp AND TARGET jsoncpp_static)
+            add_library(JsonCpp::JsonCpp ALIAS jsoncpp_static)
+        endif()
 
-    if(OLD_BUILD_OBJECT_LIBS)
-        set(BUILD_OBJECT_LIBS ${OLD_BUILD_OBJECT_LIBS})
     endif()
-
-    hide_variable(JSONCPP_WITH_STRICT_ISO)
-    hide_variable(DEBUG_LIBNAME_SUFFIX)
-    hide_variable(JSONCPP_USE_SECURE_MEMORY)
-    hide_variable(JSONCPP_WITH_EXAMPLE)
 endif()
diff --git a/config/cmake/addMPI.cmake b/config/cmake/addMPI.cmake
index 98dd18da37..82fe9f6bf4 100644
--- a/config/cmake/addMPI.cmake
+++ b/config/cmake/addMPI.cmake
@@ -24,28 +24,16 @@ if(NOT MPI_C_FOUND)
     if(MSVC) # the cmake find MPI doesn't completely work for visual studio 2017
 
         if(NOT MPI_CXX_COMPILER)
-            # message(STATUS "not mpi cxx compiler") For building MPI programs the
-            # selected Visual Studio compiler is used, namely cl.exe. So there is no
-            # need to set a specific MPI compiler.
-            set(
-                MPI_CXX_COMPILER
-                "${CMAKE_CXX_COMPILER}"
-                CACHE FILEPATH "Mpi CXX compiler" FORCE
-            )
-            set(
-                MPI_C_COMPILER
-                "${CMAKE_C_COMPILER}"
-                CACHE FILEPATH "Mpi C compiler" FORCE
-            )
+            # message(STATUS "not mpi cxx compiler") For building MPI programs the selected Visual
+            # Studio compiler is used, namely cl.exe. So there is no need to set a specific MPI
+            # compiler.
+            set(MPI_CXX_COMPILER "${CMAKE_CXX_COMPILER}" CACHE FILEPATH "Mpi CXX compiler" FORCE)
+            set(MPI_C_COMPILER "${CMAKE_C_COMPILER}" CACHE FILEPATH "Mpi C compiler" FORCE)
         endif(NOT MPI_CXX_COMPILER)
         if(MPIEXEC_EXECUTABLE) # if we found this then the target was found
             if(NOT MPI_C_LIBRARIES)
                 if(MPI_msmpi_LIBRARY)
-                    set(
-                        MPI_C_LIBRARIES
-                        ${MPI_msmpi_LIBRARY}
-                        CACHE STRING "MPI C libraries" FORCE
-                    )
+                    set(MPI_C_LIBRARIES ${MPI_msmpi_LIBRARY} CACHE STRING "MPI C libraries" FORCE)
                 else()
                     # TODO not sure how MPICH libraries are laid out on Windows
                 endif()
@@ -67,17 +55,13 @@ if(MPI_C_FOUND AND NOT TARGET MPI::MPI_C)
     set_property(TARGET MPI::MPI_C PROPERTY INTERFACE_LINK_LIBRARIES "")
     if(MPI_C_LIBRARIES)
         set_property(
-            TARGET MPI::MPI_C
-            APPEND
-            PROPERTY INTERFACE_LINK_LIBRARIES "${MPI_C_LIBRARIES}"
+            TARGET MPI::MPI_C APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${MPI_C_LIBRARIES}"
         )
     endif()
     if(MPI_C_LINK_FLAGS)
         string(STRIP "${MPI_C_LINK_FLAGS}" trimmed_mpi_c_flags)
         set_property(
-            TARGET MPI::MPI_C
-            APPEND
-            PROPERTY INTERFACE_LINK_LIBRARIES "${trimmed_mpi_c_flags}"
+            TARGET MPI::MPI_C APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${trimmed_mpi_c_flags}"
         )
     endif()
     set_target_properties(
@@ -87,12 +71,10 @@ if(MPI_C_FOUND AND NOT TARGET MPI::MPI_C)
             "${MPI_C_INCLUDE_DIR};${MPI_C_HEADER_DIR};${MPI_C_ADDITIONAL_INCLUDE_DIRS};${MPI_C_INCLUDE_PATH}"
     )
     set_target_properties(
-        MPI::MPI_C
-        PROPERTIES INTERFACE_COMPILE_OPTIONS "${MPI_C_COMPILE_OPTIONS}"
+        MPI::MPI_C PROPERTIES INTERFACE_COMPILE_OPTIONS "${MPI_C_COMPILE_OPTIONS}"
     )
     set_target_properties(
-        MPI::MPI_C
-        PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${MPI_C_COMPILE_DEFINITIONS}"
+        MPI::MPI_C PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${MPI_C_COMPILE_DEFINITIONS}"
     )
 endif()
 if(MPI_CXX_FOUND AND NOT TARGET MPI::MPI_CXX)
@@ -100,17 +82,13 @@ if(MPI_CXX_FOUND AND NOT TARGET MPI::MPI_CXX)
     set_property(TARGET MPI::MPI_CXX PROPERTY INTERFACE_LINK_LIBRARIES "")
     if(MPI_CXX_LIBRARIES)
         set_property(
-            TARGET MPI::MPI_CXX
-            APPEND
-            PROPERTY INTERFACE_LINK_LIBRARIES "${MPI_CXX_LIBRARIES}"
+            TARGET MPI::MPI_CXX APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${MPI_CXX_LIBRARIES}"
         )
     endif()
     if(MPI_CXX_LINK_FLAGS)
         string(STRIP "${MPI_CXX_LINK_FLAGS}" trimmed_mpi_cxx_flags)
         set_property(
-            TARGET MPI::MPI_CXX
-            APPEND
-            PROPERTY INTERFACE_LINK_LIBRARIES "${trimmed_mpi_cxx_flags}"
+            TARGET MPI::MPI_CXX APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${trimmed_mpi_cxx_flags}"
         )
     endif()
     set_target_properties(
@@ -120,12 +98,10 @@ if(MPI_CXX_FOUND AND NOT TARGET MPI::MPI_CXX)
             "${MPI_CXX_INCLUDE_DIR};${MPI_CXX_HEADER_DIR};${MPI_CXX_ADDITIONAL_INCLUDE_DIRS};${MPI_CXX_INCLUDE_PATH}"
     )
     set_target_properties(
-        MPI::MPI_CXX
-        PROPERTIES INTERFACE_COMPILE_OPTIONS "${MPI_CXX_COMPILE_OPTIONS}"
+        MPI::MPI_CXX PROPERTIES INTERFACE_COMPILE_OPTIONS "${MPI_CXX_COMPILE_OPTIONS}"
     )
     set_target_properties(
-        MPI::MPI_CXX
-        PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${MPI_CXX_COMPILE_DEFINITIONS}"
+        MPI::MPI_CXX PROPERTIES INTERFACE_COMPILE_DEFINITIONS "${MPI_CXX_COMPILE_DEFINITIONS}"
     )
 
 endif()
diff --git a/config/cmake/addNetworking.cmake b/config/cmake/addNetworking.cmake
new file mode 100644
index 0000000000..75b0d08b6c
--- /dev/null
+++ b/config/cmake/addNetworking.cmake
@@ -0,0 +1,44 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
+# National Security, LLC; Alliance for Sustainable Energy, LLC.
+# See the top-level NOTICE for additional details.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+if(NOT TARGET gmlc::networking)
+    set(GMLC_NETWORKING_INSTALL OFF CACHE INTERNAL "")
+    set(GMLC_NETWORKING_ASIO_INCLUDE ${PROJECT_SOURCE_DIR}/ThirdParty/asio/asio/include)
+    set(GMLC_NETWORKING_CONCURRENCY_INCLUDE ${PROJECT_SOURCE_DIR}/ThirdParty/concurrency)
+    set(GMLC_NETWORKING_DISABLE_ASIO ${HELICS_DISABLE_ASIO} CACHE INTERNAL "")
+
+    # hide some of the JSON in the networking library
+    set(JSON_CI OFF CACHE INTERNAL "")
+    set(JSON_Diagnostics OFF CACHE INTERNAL "")
+    set(JSON_ImplicitConversions ON CACHE INTERNAL "")
+    set(JSON_Install OFF CACHE INTERNAL "")
+    set(JSON_MultipleHeaders OFF CACHE INTERNAL "")
+    set(JSON_SystemInclude OFF CACHE INTERNAL "")
+
+    if(HELICS_ENABLE_ENCRYPTION)
+        list(APPEND VCPKG_MANIFEST_FEATURES "encryption")
+        set(GMLC_NETWORKING_ENABLE_ENCRYPTION ON CACHE INTERNAL "")
+    else()
+        set(GMLC_NETWORKING_ENABLE_ENCRYPTION OFF CACHE INTERNAL "")
+    endif()
+
+    add_subdirectory(ThirdParty/networking)
+
+    hide_variable(GMLC_NETWORKING_GENERATE_DOXYGEN_DOC)
+    hide_variable(GMLC_NETWORKING_INCLUDE_BOOST)
+    hide_variable(GMLC_NETWORKING_WITH_CMAKE_PACKAGE)
+    hide_variable(GMLC_NETWORKING_OBJECT_LIB)
+    hide_variable(GMLC_NETWORKING_STATIC_LIB)
+    hide_variable(GMLC_NETWORKING_CLANG_TIDY_OPTIONS)
+    hide_variable(GMLC_NETWORKING_ENABLE_SUBMODULE_UPDATE)
+    hide_variable(GMLC_NETWORKING_USE_EXTERNAL_JSON)
+
+    set_target_properties(gmlc_networking PROPERTIES FOLDER Extern)
+
+endif()
diff --git a/config/cmake/addSpdlog.cmake b/config/cmake/addSpdlog.cmake
index 3489662852..8ff49ce11a 100644
--- a/config/cmake/addSpdlog.cmake
+++ b/config/cmake/addSpdlog.cmake
@@ -11,45 +11,46 @@
 # create the spdlog target
 # -----------------------------------------------------------------------------
 
-option(${PROJECT_NAME}_USE_EXTERNAL_SPDLOG "Use external copy of spdlog" OFF)
-mark_as_advanced(${PROJECT_NAME}_USE_EXTERNAL_SPDLOG)
+if(NOT TARGET spdlog::spdlog)
+    option(${PROJECT_NAME}_USE_EXTERNAL_SPDLOG "Use external copy of spdlog" OFF)
+    mark_as_advanced(${PROJECT_NAME}_USE_EXTERNAL_SPDLOG)
 
-if(${PROJECT_NAME}_USE_EXTERNAL_SPDLOG)
-    # find spdlog somewhere on the system
-    # NOTE/TODO: there may be odd corner cases when external spdlog depends on an
-    # external fmt, but we tell HELICS to use the vendored copy of fmt
-    # NOTE2: static spdlog should be built with CMAKE_POSITION_INDEPENDENT_CODE
-    find_package(spdlog REQUIRED)
-else()
-    # the spdlog install internally stores whether it was built with this on
-    # our vendored copy of spdlog should never use its own fmt
-    set(SPDLOG_FMT_EXTERNAL ON CACHE INTERNAL "")
+    if(${PROJECT_NAME}_USE_EXTERNAL_SPDLOG)
+        # find spdlog somewhere on the system NOTE/TODO: there may be odd corner cases when external
+        # spdlog depends on an external fmt, but we tell HELICS to use the vendored copy of fmt
+        # NOTE2: static spdlog should be built with CMAKE_POSITION_INDEPENDENT_CODE
+        find_package(spdlog REQUIRED)
+    else()
+        # the spdlog install internally stores whether it was built with this on our vendored copy
+        # of spdlog should never use its own fmt
+        set(SPDLOG_FMT_EXTERNAL ON CACHE INTERNAL "")
 
-    # use the vendored SPDLOG library
-    add_subdirectory(ThirdParty/spdlog)
+        # use the vendored SPDLOG library
+        add_subdirectory(ThirdParty/spdlog)
 
-    set_target_properties(spdlog PROPERTIES FOLDER Extern)
-    hide_variable(SPDLOG_BUILD_ALL)
-    hide_variable(SPDLOG_BUILD_BENCH)
-    hide_variable(SPDLOG_BUILD_EXAMPLE)
-    hide_variable(SPDLOG_BUILD_EXAMPLE_HO)
-    hide_variable(SPDLOG_BUILD_SHARED)
-    hide_variable(SPDLOG_BUILD_TESTS)
-    hide_variable(SPDLOG_BUILD_TESTS_HO)
-    hide_variable(SPDLOG_BUILD_WARNINGS)
-    hide_variable(SPDLOG_ENABLE_PCH)
-    hide_variable(SPDLOG_NO_ATOMIC_LEVELS)
-    hide_variable(SPDLOG_NO_EXCEPTIONS)
-    hide_variable(SPDLOG_NO_THREAD_ID)
-    hide_variable(SPDLOG_NO_TLS)
-    hide_variable(SPDLOG_PREVENT_CHILD_FD)
-    hide_variable(SPDLOG_SANITIZE_ADDRESS)
-    hide_variable(SPDLOG_TIDY)
-    hide_variable(SPDLOG_WCHAR_FILENAMES)
-    hide_variable(SPDLOG_WCHAR_SUPPORT)
-    hide_variable(SPDLOG_DISABLE_DEFAULT_LOGGER)
-    hide_variable(SPDLOG_FMT_EXTERNAL_HO)
-    hide_variable(SPDLOG_INSTALL)
-    hide_variable(SPDLOG_CLOCK_COARSE)
-    hide_variable(SPDLOG_USE_STD_FORMAT)
+        set_target_properties(spdlog PROPERTIES FOLDER Extern)
+        hide_variable(SPDLOG_BUILD_ALL)
+        hide_variable(SPDLOG_BUILD_BENCH)
+        hide_variable(SPDLOG_BUILD_EXAMPLE)
+        hide_variable(SPDLOG_BUILD_EXAMPLE_HO)
+        hide_variable(SPDLOG_BUILD_SHARED)
+        hide_variable(SPDLOG_BUILD_TESTS)
+        hide_variable(SPDLOG_BUILD_TESTS_HO)
+        hide_variable(SPDLOG_BUILD_WARNINGS)
+        hide_variable(SPDLOG_ENABLE_PCH)
+        hide_variable(SPDLOG_NO_ATOMIC_LEVELS)
+        hide_variable(SPDLOG_NO_EXCEPTIONS)
+        hide_variable(SPDLOG_NO_THREAD_ID)
+        hide_variable(SPDLOG_NO_TLS)
+        hide_variable(SPDLOG_PREVENT_CHILD_FD)
+        hide_variable(SPDLOG_SANITIZE_ADDRESS)
+        hide_variable(SPDLOG_TIDY)
+        hide_variable(SPDLOG_WCHAR_FILENAMES)
+        hide_variable(SPDLOG_WCHAR_SUPPORT)
+        hide_variable(SPDLOG_DISABLE_DEFAULT_LOGGER)
+        hide_variable(SPDLOG_FMT_EXTERNAL_HO)
+        hide_variable(SPDLOG_INSTALL)
+        hide_variable(SPDLOG_CLOCK_COARSE)
+        hide_variable(SPDLOG_USE_STD_FORMAT)
+    endif()
 endif()
diff --git a/config/cmake/addUnits.cmake b/config/cmake/addUnits.cmake
index c0d24e133e..ce2671f5a7 100644
--- a/config/cmake/addUnits.cmake
+++ b/config/cmake/addUnits.cmake
@@ -7,34 +7,38 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-option(${PROJECT_NAME}_USE_EXTERNAL_UNITS "Use external copy of LLNL Units" OFF)
-mark_as_advanced(${PROJECT_NAME}_USE_EXTERNAL_UNITS)
-
-if(${PROJECT_NAME}_USE_EXTERNAL_UNITS)
-    # NOTE: static units should be built with CMAKE_POSITION_INDEPENDENT_CODE
-    find_package(units REQUIRED)
-else()
-    # so units cpp exports to the correct target export
-    set(UNITS_INSTALL OFF CACHE INTERNAL "")
-
-    if(NOT CMAKE_CXX_STANDARD)
-        set(CMAKE_CXX_STANDARD 17) # Supported values are ``11``, ``14``, and ``17``.
-    endif()
+if(NOT TARGET units::units)
+
+    option(${PROJECT_NAME}_USE_EXTERNAL_UNITS "Use external copy of LLNL Units" OFF)
+    mark_as_advanced(${PROJECT_NAME}_USE_EXTERNAL_UNITS)
+
+    if(${PROJECT_NAME}_USE_EXTERNAL_UNITS)
+        # NOTE: static units should be built with CMAKE_POSITION_INDEPENDENT_CODE
+        find_package(units REQUIRED)
+    else()
+        # so units cpp exports to the correct target export
+        set(UNITS_INSTALL OFF CACHE INTERNAL "")
 
-    set(UNITS_BUILD_OBJECT_LIBRARY OFF CACHE INTERNAL "")
-    set(UNITS_BUILD_STATIC_LIBRARY ON CACHE INTERNAL "")
-    set(UNITS_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "")
-    set(UNITS_BUILD_CONVERTER_APP OFF CACHE INTERNAL "")
-    set(UNITS_BUILD_WEBSERVER OFF CACHE INTERNAL "")
-    set(UNITS_CLANG_TIDY_OPTIONS "" CACHE INTERNAL "")
-    set(UNITS_BUILD_FUZZ_TARGETS OFF CACHE INTERNAL "")
+        if(NOT CMAKE_CXX_STANDARD)
+            set(CMAKE_CXX_STANDARD 17) # Supported values are ``11``, ``14``, and ``17``.
+        endif()
 
-    add_subdirectory("${PROJECT_SOURCE_DIR}/ThirdParty/units"
-                     "${PROJECT_BINARY_DIR}/ThirdParty/units")
+        set(UNITS_BUILD_OBJECT_LIBRARY OFF CACHE INTERNAL "")
+        set(UNITS_BUILD_STATIC_LIBRARY ON CACHE INTERNAL "")
+        set(UNITS_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "")
+        set(UNITS_BUILD_CONVERTER_APP OFF CACHE INTERNAL "")
+        set(UNITS_BUILD_WEBSERVER OFF CACHE INTERNAL "")
+        set(UNITS_CLANG_TIDY_OPTIONS "" CACHE INTERNAL "")
+        set(UNITS_BUILD_FUZZ_TARGETS OFF CACHE INTERNAL "")
 
-    set_target_properties(units PROPERTIES FOLDER Extern)
+        add_subdirectory(
+            "${PROJECT_SOURCE_DIR}/ThirdParty/units" "${PROJECT_BINARY_DIR}/ThirdParty/units"
+        )
 
-    hide_variable(UNITS_HEADER_ONLY)
-    hide_variable(UNITS_BUILD_OBJECT_LIBRARY)
-    hide_variable(UNITS_NAMESPACE)
+        set_target_properties(units PROPERTIES FOLDER Extern)
+
+        hide_variable(UNITS_HEADER_ONLY)
+        hide_variable(UNITS_BUILD_OBJECT_LIBRARY)
+        hide_variable(UNITS_NAMESPACE)
+    endif()
 endif()
diff --git a/config/cmake/addUtilities.cmake b/config/cmake/addUtilities.cmake
new file mode 100644
index 0000000000..a2d5a573e2
--- /dev/null
+++ b/config/cmake/addUtilities.cmake
@@ -0,0 +1,31 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
+# National Security, LLC; Alliance for Sustainable Energy, LLC.
+# See the top-level NOTICE for additional details.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+if(NOT TARGET gmlc::utilities)
+    set(GMLC_UTILITIES_INSTALL OFF CACHE INTERNAL "")
+
+    add_subdirectory(ThirdParty/utilities)
+
+    hide_variable(GMLC_UTILITIES_GENERATE_DOXYGEN_DOC)
+    hide_variable(GMLC_UTILITIES_INCLUDE_BOOST)
+    hide_variable(GMLC_UTILITIES_USE_BOOST_SPIRIT)
+    hide_variable(GMLC_UTILITIES_WITH_CMAKE_PACKAGE)
+    hide_variable(GMLC_UTILITIES_OBJECT_LIB)
+    hide_variable(GMLC_UTILITIES_STATIC_LIB)
+    hide_variable(GMLC_UTILITIES_CLANG_TIDY_OPTIONS)
+
+    target_compile_definitions(gmlc_utilities PUBLIC USE_STD_STRING_VIEW=1)
+
+    set_target_properties(gmlc_utilities PROPERTIES FOLDER Extern)
+    if(NOT ${PROJECT_NAME}_DISABLE_BOOST)
+        target_include_directories(
+            gmlc_utilities SYSTEM PRIVATE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
+        )
+    endif()
+endif()
diff --git a/config/cmake/addZeroMQ.cmake b/config/cmake/addZeroMQ.cmake
index 797f1a1f11..64a90d88ad 100644
--- a/config/cmake/addZeroMQ.cmake
+++ b/config/cmake/addZeroMQ.cmake
@@ -9,41 +9,36 @@
 
 # file to include ZMQ
 option(${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY
-       "only search for system zeromq libraries, bypass local build options" OFF)
+       "only search for system zeromq libraries, bypass local build options" OFF
+)
 
 mark_as_advanced(${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY)
 
 if(MSVC)
     cmake_dependent_option(
         ${PROJECT_NAME}_ZMQ_SUBPROJECT
-        "enable ZMQ to automatically download and include as a subproject"
-        ON
-        "NOT ${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY"
-        OFF
+        "enable ZMQ to automatically download and include as a subproject" ON
+        "NOT ${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY" OFF
     )
 else()
     cmake_dependent_option(
         ${PROJECT_NAME}_ZMQ_SUBPROJECT
-        "enable ZMQ to automatically download and include as a subproject"
-        OFF
-        "NOT ${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY"
-        OFF
+        "enable ZMQ to automatically download and include as a subproject" OFF
+        "NOT ${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY" OFF
     )
 endif()
 cmake_dependent_option(
     ${PROJECT_NAME}_ZMQ_FORCE_SUBPROJECT
-    "force ZMQ to automatically download and include as a subproject"
-    OFF
-    "NOT ${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY"
-    OFF
+    "force ZMQ to automatically download and include as a subproject" OFF
+    "NOT ${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY" OFF
 )
 
 mark_as_advanced(${PROJECT_NAME}_USE_SYSTEM_ZEROMQ_ONLY)
 mark_as_advanced(${PROJECT_NAME}_ZMQ_SUBPROJECT)
 mark_as_advanced(${PROJECT_NAME}_ZMQ_FORCE_SUBPROJECT)
 
-# Add option after seeing if only the static ZMQ library is available
-# Using a macro so the option() command appears near other option() commands
+# Add option after seeing if only the static ZMQ library is available Using a macro so the option()
+# command appears near other option() commands
 macro(add_zmq_static_lib_option)
     if(ZeroMQ_STATIC_LIBRARY AND NOT ZeroMQ_LIBRARY)
         option(${PROJECT_NAME}_USE_ZMQ_STATIC_LIBRARY "use the ZMQ static library" ON)
@@ -108,17 +103,15 @@ else()
                 hide_variable(ZeroMQ_STATIC_LIBRARY)
                 hide_variable(ZeroMQ_INCLUDE_DIR)
             else()
-                show_variable(ZeroMQ_DEBUG_LIBRARY FILEPATH
-                              "path to the ZeroMQ debug library" "")
+                show_variable(ZeroMQ_DEBUG_LIBRARY FILEPATH "path to the ZeroMQ debug library" "")
                 show_variable(ZeroMQ_LIBRARY FILEPATH "path to the ZeroMQ library" "")
-                show_variable(ZeroMQ_ROOT_DIR PATH "path to the ZeroMQ root directory"
-                              "")
+                show_variable(ZeroMQ_ROOT_DIR PATH "path to the ZeroMQ root directory" "")
                 if(${PROJECT_NAME}_USE_ZMQ_STATIC_LIBRARY)
-                    show_variable(ZeroMQ_STATIC_LIBRARY FILEPATH
-                                  "path to the ZeroMQ static library" "")
+                    show_variable(
+                        ZeroMQ_STATIC_LIBRARY FILEPATH "path to the ZeroMQ static library" ""
+                    )
                 endif()
-                show_variable(ZeroMQ_INCLUDE_DIR PATH
-                              "path to the ZeroMQ include directory" "")
+                show_variable(ZeroMQ_INCLUDE_DIR PATH "path to the ZeroMQ include directory" "")
             endif()
         else()
             set(${PROJECT_NAME}_ZMQ_LOCAL_BUILD OFF CACHE INTERNAL "")
@@ -132,10 +125,6 @@ add_zmq_static_lib_option()
 
 if(WIN32 AND NOT MSYS AND NOT CYGWIN)
     if(TARGET libzmq)
-        install(
-            FILES $<TARGET_FILE:libzmq>
-            DESTINATION ${CMAKE_INSTALL_BINDIR}
-            COMPONENT Runtime
-        )
+        install(FILES $<TARGET_FILE:libzmq> DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
     endif()
 endif()
diff --git a/config/cmake/addfmt.cmake b/config/cmake/addfmt.cmake
index 2a2763589d..b109d0af8f 100644
--- a/config/cmake/addfmt.cmake
+++ b/config/cmake/addfmt.cmake
@@ -13,46 +13,41 @@
 
 option(${PROJECT_NAME}_USE_EXTERNAL_FMT "Use external copy of {fmt}" OFF)
 mark_as_advanced(${PROJECT_NAME}_USE_EXTERNAL_FMT)
+if(NOT TARGET fmt::fmt)
+    if(${PROJECT_NAME}_USE_EXTERNAL_FMT)
+        # Note: static fmt should be built with CMAKE_POSITION_INDEPENDENT_CODE
+        find_package(fmt REQUIRED)
+    else()
+        set(FMT_SILENT ON)
 
-if(${PROJECT_NAME}_USE_EXTERNAL_FMT)
-    # Note: static fmt should be built with CMAKE_POSITION_INDEPENDENT_CODE
-    find_package(fmt REQUIRED)
-else()
-    set(FMT_SILENT ON)
+        if(NOT CMAKE_CXX_STANDARD)
+            set(CMAKE_CXX_STANDARD 17) # Supported values are ``17``, and ``20``.
+        endif()
 
-    if(NOT CMAKE_CXX_STANDARD)
-        set(CMAKE_CXX_STANDARD 17) # Supported values are ``14``, and ``17``.
-    endif()
+        set(SUPPORTS_VARIADIC_TEMPLATES ON)
+        set(SUPPORTS_USER_DEFINED_LITERALS ON)
+        set(FMT_HAS_VARIANT ON)
+        set(type STRING CACHE INTERNAL "")
 
-    set(SUPPORTS_VARIADIC_TEMPLATES ON)
-    set(SUPPORTS_USER_DEFINED_LITERALS ON)
-    set(FMT_HAS_VARIANT ON)
-    set(type STRING CACHE INTERNAL "")
+        if(CYGWIN)
+            set(FMT_OS OFF CACHE INTERNAL "")
+        else()
+            set(FMT_OS ON CACHE INTERNAL "")
+        endif()
+        # add the vendored FMT header only library
+        add_subdirectory(ThirdParty/fmtlib)
 
-    if (CYGWIN)
-        set(FMT_OS
-            OFF
-            CACHE INTERNAL ""
-        )
-    else()
-        set(FMT_OS
-            ON
-            CACHE INTERNAL ""
-        )
+        set_target_properties(fmt PROPERTIES FOLDER Extern)
+        hide_variable(FMT_DOC)
+        hide_variable(FMT_INSTALL)
+        hide_variable(FMT_PEDANTIC)
+        hide_variable(FMT_TEST)
+        hide_variable(FMT_WERROR)
+        hide_variable(FMT_FUZZ)
+        hide_variable(FMT_CUDA_TEST)
+        hide_variable(FMT_DEBUG_POSTFIX)
+        hide_variable(FMT_INC_DIR)
+        hide_variable(FMT_MODULE)
+        hide_variable(FMT_SYSTEM_HEADERS)
     endif()
-    # add the vendored FMT header only library
-    add_subdirectory(ThirdParty/fmtlib)
-
-    set_target_properties(fmt PROPERTIES FOLDER Extern)
-    hide_variable(FMT_DOC)
-    hide_variable(FMT_INSTALL)
-    hide_variable(FMT_PEDANTIC)
-    hide_variable(FMT_TEST)
-    hide_variable(FMT_WERROR)
-    hide_variable(FMT_FUZZ)
-    hide_variable(FMT_CUDA_TEST)
-    hide_variable(FMT_DEBUG_POSTFIX)
-    hide_variable(FMT_INC_DIR)
-    hide_variable(FMT_MODULE)
-    hide_variable(FMT_SYSTEM_HEADERS)
 endif()
diff --git a/config/cmake/addlibzmq.cmake b/config/cmake/addlibzmq.cmake
index 406120ad11..9f21c18865 100644
--- a/config/cmake/addlibzmq.cmake
+++ b/config/cmake/addlibzmq.cmake
@@ -19,151 +19,87 @@ else()
     set(zmq_shared_build ON)
 endif()
 
-
 set(${PROJECT_NAME}_LIBZMQ_VERSION v4.3.4)
 
-
 string(TOLOWER "libzmq" lcName)
 
-    include(FetchContent)
+include(FetchContent)
 
-    mark_as_advanced(FETCHCONTENT_BASE_DIR)
-    mark_as_advanced(FETCHCONTENT_FULLY_DISCONNECTED)
-    mark_as_advanced(FETCHCONTENT_QUIET)
-    mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED)
+mark_as_advanced(FETCHCONTENT_BASE_DIR)
+mark_as_advanced(FETCHCONTENT_FULLY_DISCONNECTED)
+mark_as_advanced(FETCHCONTENT_QUIET)
+mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED)
 
-    fetchcontent_declare(
-        libzmq
-        GIT_REPOSITORY https://github.com/zeromq/libzmq.git
-        GIT_TAG ${${PROJECT_NAME}_LIBZMQ_VERSION}
-    )
+fetchcontent_declare(
+    libzmq GIT_REPOSITORY https://github.com/zeromq/libzmq.git
+    GIT_TAG ${${PROJECT_NAME}_LIBZMQ_VERSION}
+)
 
-    fetchcontent_getproperties(libzmq)
+fetchcontent_getproperties(libzmq)
 
-    if(NOT ${lcName}_POPULATED)
-        # Fetch the content using previously declared details
-        fetchcontent_populate(libzmq)
+if(NOT ${lcName}_POPULATED)
+    # Fetch the content using previously declared details
+    fetchcontent_populate(libzmq)
 
-    endif()
+endif()
 
-    hide_variable(FETCHCONTENT_SOURCE_DIR_LIBZMQ)
-    hide_variable(FETCHCONTENT_UPDATES_DISCONNECTED_LIBZMQ)
+hide_variable(FETCHCONTENT_SOURCE_DIR_LIBZMQ)
+hide_variable(FETCHCONTENT_UPDATES_DISCONNECTED_LIBZMQ)
 
 # Set custom variables, policies, etc. ...
 
-set(ZMQ_BUILD_TESTS
-    OFF
-    CACHE INTERNAL ""
-)
-set(ENABLE_CURVE
-    OFF
-    CACHE INTERNAL ""
-)
-set(ENABLE_DRAFTS
-    OFF
-    CACHE INTERNAL ""
-)
-set(WITH_DOCS
-    OFF
-    CACHE INTERNAL ""
-)
-set(${PROJECT_NAME}_ZMQ_LOCAL_BUILD
-    ON
-    CACHE INTERNAL ""
-)
-set(LIBZMQ_PEDANTIC
-    OFF
-    CACHE INTERNAL ""
-)
-set(WITH_PERF_TOOL
-    OFF
-    CACHE INTERNAL ""
-)
-set(ENABLE_CPACK
-    OFF
-    CACHE INTERNAL ""
-)
-set(BUILD_STATIC
-    ${zmq_static_build}
-    CACHE INTERNAL ""
-)
-set(BUILD_SHARED
-    ${zmq_shared_build}
-    CACHE INTERNAL ""
-)
-set(ENABLE_CPACK
-    OFF
-    CACHE INTERNAL ""
-)
-set(ENABLE_WS
-    OFF
-    CACHE INTERNAL ""
-)
+set(ZMQ_BUILD_TESTS OFF CACHE INTERNAL "")
+set(ENABLE_CURVE OFF CACHE INTERNAL "")
+set(ENABLE_DRAFTS OFF CACHE INTERNAL "")
+set(WITH_DOCS OFF CACHE INTERNAL "")
+set(${PROJECT_NAME}_ZMQ_LOCAL_BUILD ON CACHE INTERNAL "")
+set(LIBZMQ_PEDANTIC OFF CACHE INTERNAL "")
+set(WITH_PERF_TOOL OFF CACHE INTERNAL "")
+set(ENABLE_CPACK OFF CACHE INTERNAL "")
+set(BUILD_STATIC ${zmq_static_build} CACHE INTERNAL "")
+set(BUILD_SHARED ${zmq_shared_build} CACHE INTERNAL "")
+set(ENABLE_CPACK OFF CACHE INTERNAL "")
+set(ENABLE_WS OFF CACHE INTERNAL "")
 
-set(ENABLE_PRECOMPILED
-    OFF
-    CACHE INTERNAL ""
-)
+set(ENABLE_PRECOMPILED OFF CACHE INTERNAL "")
 
-set(ENABLE_CLANG
-    ON
-    CACHE INTERNAL ""
-)
+set(ENABLE_CLANG ON CACHE INTERNAL "")
 
-set(ENABLE_TSAN
-    OFF
-    CACHE INTERNAL ""
-)
+set(ENABLE_TSAN OFF CACHE INTERNAL "")
 
-set(ENABLE_TSAN
-    OFF
-    CACHE INTERNAL ""
-)
-if (${PROJECT_NAME}_ENABLE_ENCRYPTION AND NOT ${PROJECT_NAME}_DISABLE_ZMQ_ENCRYPTION)
-    set(WITH_LIBSODIUM
-        ON
-        CACHE INTERNAL ""
-)
+set(ENABLE_TSAN OFF CACHE INTERNAL "")
+if(${PROJECT_NAME}_ENABLE_ENCRYPTION AND NOT ${PROJECT_NAME}_DISABLE_ZMQ_ENCRYPTION)
+    set(WITH_LIBSODIUM ON CACHE INTERNAL "")
 else()
- set(WITH_LIBSODIUM
-        OFF
-        CACHE INTERNAL ""
-)
+    set(WITH_LIBSODIUM OFF CACHE INTERNAL "")
 endif()
 
-set(ZMQ_OUTPUT_BASENAME
-    zmq
-    CACHE INTERNAL ""
-)
+set(ZMQ_OUTPUT_BASENAME zmq CACHE INTERNAL "")
 
-set(ZEROMQ_CMAKECONFIG_INSTALL_DIR
-    ${CMAKE_INSTALL_LIBDIR}/cmake/ZeroMQ
-    CACHE INTERNAL ""
-)
+set(ZEROMQ_CMAKECONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/ZeroMQ CACHE INTERNAL "")
 # Bring the populated content into the build
 set(COMPILER_SUPPORTS_CXX11 ON)
 set(ZMQ_HAVE_NOEXCEPT ON)
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        message(STATUS "clang compiling for ZMQ ${CMAKE_CXX_FLAGS}")
-        set(OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-parameter ")
+    message(STATUS "clang compiling for ZMQ ${CMAKE_CXX_FLAGS}")
+    set(OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-parameter "
+    )
 endif()
 
 add_subdirectory(${${lcName}_SOURCE_DIR} ${${lcName}_BINARY_DIR} EXCLUDE_FROM_ALL)
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set(CMAKE_CXX_FLAGS ${OLDCMAKE_CXX_FLAGS})
+    set(CMAKE_CXX_FLAGS ${OLDCMAKE_CXX_FLAGS})
 endif()
 
-
 set(ZeroMQ_FOUND TRUE)
 
 if(${PROJECT_NAME}_USE_ZMQ_STATIC_LIBRARY)
     set_target_properties(libzmq-static PROPERTIES FOLDER "Extern")
-    target_compile_options(
-        libzmq-static PRIVATE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fPIC>
-    )
+    target_compile_options(libzmq-static PRIVATE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fPIC>)
 
 else()
     set_target_properties(libzmq PROPERTIES FOLDER "Extern")
@@ -209,10 +145,8 @@ if(${PROJECT_NAME}_BUILD_CXX_SHARED_LIB OR NOT ${PROJECT_NAME}_DISABLE_C_SHARED_
                 FRAMEWORK DESTINATION "Library/Frameworks"
             )
         elseif(WIN32)
-            install(
-                FILES $<TARGET_FILE:${zmq_target_output}>
-                DESTINATION ${CMAKE_INSTALL_BINDIR}
-                COMPONENT libs
+            install(FILES $<TARGET_FILE:${zmq_target_output}> DESTINATION ${CMAKE_INSTALL_BINDIR}
+                    COMPONENT libs
             )
         else()
             message(
@@ -220,10 +154,7 @@ if(${PROJECT_NAME}_BUILD_CXX_SHARED_LIB OR NOT ${PROJECT_NAME}_DISABLE_C_SHARED_
                     "Update to CMake 3.13+ or enable the ${PROJECT_NAME}_USE_ZMQ_STATIC_LIBRARY CMake option to install when using ZMQ as a subproject"
             )
         endif()
-        if(MSVC
-           AND NOT EMBEDDED_DEBUG_INFO
-           AND NOT ${PROJECT_NAME}_BINARY_ONLY_INSTALL
-        )
+        if(MSVC AND NOT EMBEDDED_DEBUG_INFO AND NOT ${PROJECT_NAME}_BINARY_ONLY_INSTALL)
             install(
                 FILES $<TARGET_PDB_FILE:${zmq_target_output}>
                 DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -232,10 +163,8 @@ if(${PROJECT_NAME}_BUILD_CXX_SHARED_LIB OR NOT ${PROJECT_NAME}_DISABLE_C_SHARED_
             )
         endif()
         if(MSVC AND NOT ${PROJECT_NAME}_BINARY_ONLY_INSTALL)
-            install(
-                FILES $<TARGET_LINKER_FILE:${zmq_target_output}>
-                DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                COMPONENT libs
+            install(FILES $<TARGET_LINKER_FILE:${zmq_target_output}>
+                    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs
             )
         endif()
 
diff --git a/config/cmake/clang-cxx-dev-tools.cmake b/config/cmake/clang-cxx-dev-tools.cmake
index 13640e6e9e..d341109f3a 100644
--- a/config/cmake/clang-cxx-dev-tools.cmake
+++ b/config/cmake/clang-cxx-dev-tools.cmake
@@ -10,12 +10,8 @@ file(GLOB ALL_APPLICATION_API_FILES src/helics/application_api/*.[ch]pp)
 
 file(GLOB ALL_APP_FILES src/helics/apps/*.[ch]pp)
 
-file(
-    GLOB
-    ALL_SHARED_API_FILES
-    src/helics/shared_api_library/*.[ch]pp
-    src/helics/shared_api_library/*.[ch]
-    src/helics/shared_api_library/internal/*.h
+file(GLOB ALL_SHARED_API_FILES src/helics/shared_api_library/*.[ch]pp
+     src/helics/shared_api_library/*.[ch] src/helics/shared_api_library/internal/*.h
 )
 
 file(
@@ -31,13 +27,11 @@ file(
 
 file(GLOB ALL_COMMON_FILES src/helics/common/*.[ch]pp)
 
-set(ALL_APPLICATION_FILES ${ALL_APPLICATION_API_FILES} ${ALL_APP_FILES}
-                          ${ALL_SHARED_API_FILES})
+set(ALL_APPLICATION_FILES ${ALL_APPLICATION_API_FILES} ${ALL_APP_FILES} ${ALL_SHARED_API_FILES})
 
 set(ALL_CORE_FILES ${ALL_CORE_FILES} ${ALL_COMMON_FILES})
 
-set(
-    INCLUDE_DIRECTORIES
+set(INCLUDE_DIRECTORIES
     ${PROJECT_SOURCE_DIR}/src/helics/core
     ${PROJECT_SOURCE_DIR}/src/helics/application_api
     ${PROJECT_SOURCE_DIR}/src/helics/apps
@@ -62,31 +56,21 @@ endforeach(f)
 # Adding clang-format target if executable is found
 find_program(CLANG_FORMAT "clang-format")
 if(CLANG_FORMAT)
-    add_custom_target(
-        clang-format-test
-        COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_TEST_FILES}
-    )
+    add_custom_target(clang-format-test COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_TEST_FILES})
 
     add_custom_target(
-        clang-format-application
-        COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_APPLICATION_FILES}
+        clang-format-application COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_APPLICATION_FILES}
     )
 
-    add_custom_target(
-        clang-format-core
-        COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_CORE_FILES}
-    )
+    add_custom_target(clang-format-core COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_CORE_FILES})
 
     add_custom_target(
-        clang-format-examples
-        COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_EXAMPLE_FILES}
+        clang-format-examples COMMAND ${CLANG_FORMAT} -i -style=file ${ALL_EXAMPLE_FILES}
     )
 
     add_custom_target(
-        clang-format-all
-        DEPENDS
-            clang-format-test clang-format-application clang-format-core
-            clang-format-examples
+        clang-format-all DEPENDS clang-format-test clang-format-application clang-format-core
+                                 clang-format-examples
     )
 endif()
 
@@ -94,51 +78,26 @@ endif()
 find_program(CLANG_TIDY "clang-tidy")
 if(CLANG_TIDY)
     add_custom_target(
-        clang-tidy-test
-        COMMAND
-            ${CLANG_TIDY}
-            ${ALL_TEST_FILES}
-            -config=''
-            --
-            -std=c++14
-            ${INCLUDES}
+        clang-tidy-test COMMAND ${CLANG_TIDY} ${ALL_TEST_FILES} -config='' -- -std=c++14
+                                ${INCLUDES}
     )
 
     add_custom_target(
-        clang-tidy-application
-        COMMAND
-            ${CLANG_TIDY}
-            ${ALL_APPLICATION_FILES}
-            -config=''
-            --
-            -std=c++14
-            ${INCLUDES}
+        clang-tidy-application COMMAND ${CLANG_TIDY} ${ALL_APPLICATION_FILES} -config='' --
+                                       -std=c++14 ${INCLUDES}
     )
 
     add_custom_target(
-        clang-tidy-core
-        COMMAND
-            ${CLANG_TIDY}
-            ${ALL_CORE_FILES}
-            -config=''
-            --
-            -std=c++14
-            ${INCLUDES}
+        clang-tidy-core COMMAND ${CLANG_TIDY} ${ALL_CORE_FILES} -config='' -- -std=c++14
+                                ${INCLUDES}
     )
     add_custom_target(
         clang-tidy-ccore
         COMMAND
-            ${CLANG_TIDY}
-            ${PROJECT_SOURCE_DIR}/src/helics/core/CommonCore.cpp
-            ${PROJECT_SOURCE_DIR}/src/helics/core/CoreBroker.cpp
-            -config=''
-            --
-            -std=c++14
+            ${CLANG_TIDY} ${PROJECT_SOURCE_DIR}/src/helics/core/CommonCore.cpp
+            ${PROJECT_SOURCE_DIR}/src/helics/core/CoreBroker.cpp -config='' -- -std=c++14
             ${INCLUDES}
     )
 
-    add_custom_target(
-        clang-tidy-all
-        DEPENDS clang-tidy-test clang-tidy-application clang-tidy-core
-    )
+    add_custom_target(clang-tidy-all DEPENDS clang-tidy-test clang-tidy-application clang-tidy-core)
 endif()
diff --git a/config/cmake/combineLicenses.cmake b/config/cmake/combineLicenses.cmake
index 6e6ace577d..4dcb4fb691 100644
--- a/config/cmake/combineLicenses.cmake
+++ b/config/cmake/combineLicenses.cmake
@@ -7,22 +7,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-# takes a list of names and license file paths and combines the contents into a single
-# file
+# takes a list of names and license file paths and combines the contents into a single file
 function(combineLicenses OUT_FILE)
     file(WRITE "${OUT_FILE}.in" "Third-Party Licenses")
     list(LENGTH ARGN num_entries)
     math(EXPR end_entries "${num_entries}-1")
-    foreach(
-        entry
-        RANGE
-        0
-        ${end_entries}
-        2
-    )
-        file(
-            APPEND "${OUT_FILE}.in"
-            "\n\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\n"
+    foreach(entry RANGE 0 ${end_entries} 2)
+        file(APPEND "${OUT_FILE}.in"
+             "\n\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\n"
         )
         list(GET ARGN ${entry} entry_name)
         math(EXPR entry_file "${entry}+1")
diff --git a/config/cmake/commonBuildFlags.cmake b/config/cmake/commonBuildFlags.cmake
new file mode 100644
index 0000000000..0ca952a5a0
--- /dev/null
+++ b/config/cmake/commonBuildFlags.cmake
@@ -0,0 +1,68 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
+# National Security, LLC; Alliance for Sustainable Energy, LLC.
+# See the top-level NOTICE for additional details.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# cmake script to set up build output directories
+
+include(ucm)
+
+# -----------------------------------------------------------------------------
+# General project wide configuration for debug postfix
+# -----------------------------------------------------------------------------
+if(NOT NO_DEBUG_POSFIX AND NOT CMAKE_DEBUG_POSTFIX)
+    set(CMAKE_DEBUG_POSTFIX d)
+endif()
+
+if(NOT TARGET compile_flags_target)
+    add_library(compile_flags_target INTERFACE)
+endif()
+
+if(NOT TARGET build_flags_target)
+    add_library(build_flags_target INTERFACE)
+endif()
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    mark_as_advanced(BUILD_TESTING)
+    include(compiler_flags)
+
+endif()
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    if(NOT USE_LIBCXX)
+        show_variable(STATIC_STANDARD_LIB STRING "Link against a static standard lib" default)
+        set_property(CACHE STATIC_STANDARD_LIB PROPERTY STRINGS default static dynamic)
+    else()
+        hide_variable(STATIC_STANDARD_LIB)
+    endif()
+    if(MSVC)
+        show_variable(
+            ${PROJECT_NAME}_EMBEDDED_DEBUG_INFO STRING "embed debug info into lib files" default
+        )
+        set_property(
+            CACHE ${PROJECT_NAME}_EMBEDDED_DEBUG_INFO PROPERTY STRINGS default embedded external
+        )
+    else()
+        hide_variable(${PROJECT_NAME}_EMBEDDED_DEBUG_INFO)
+    endif()
+endif()
+
+if(STATIC_STANDARD_LIB STREQUAL "default")
+
+elseif(STATIC_STANDARD_LIB STREQUAL "static")
+    ucm_set_runtime(STATIC)
+elseif(STATIC_STANDARD_LIB STREQUAL "dynamic")
+    ucm_set_runtime(DYNAMIC)
+endif()
+
+if(${PROJECT_NAME}_EMBEDDED_DEBUG_INFO STREQUAL "default")
+
+elseif(${PROJECT_NAME}_EMBEDDED_DEBUG_INFO STREQUAL "external")
+    ucm_set_embedded_debug(EXTERNAL)
+else()
+    ucm_set_embedded_debug(EMBEDDED)
+endif()
diff --git a/config/cmake/commonBuildPaths.cmake b/config/cmake/commonBuildPaths.cmake
new file mode 100644
index 0000000000..011833aec2
--- /dev/null
+++ b/config/cmake/commonBuildPaths.cmake
@@ -0,0 +1,93 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
+# National Security, LLC; Alliance for Sustainable Energy, LLC.
+# See the top-level NOTICE for additional details.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# cmake script to set up build output directories
+
+# -----------------------------------------------------------------------------
+# set the install path to a local directory
+# -----------------------------------------------------------------------------
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    if(WIN32)
+        if(MSVC)
+            set(CMAKE_INSTALL_PREFIX "C:/local/helics_${HELICS_VERSION_UNDERSCORE}/"
+                CACHE PATH "default install path" FORCE
+            )
+        elseif(MINGW AND NOT MSYS)
+            set(CMAKE_INSTALL_PREFIX "C:/local/helics_${HELICS_VERSION_UNDERSCORE}/"
+                CACHE PATH "default install path" FORCE
+            )
+        elseif(MSYS)
+            # use CMAKE_OBJCOPY here since it is somewhat less likely to be overridden by users
+            # rather than the compiler
+            get_filename_component(path_bin ${CMAKE_OBJCOPY} DIRECTORY)
+            get_filename_component(path_install ${path_bin} DIRECTORY)
+            set(CMAKE_INSTALL_PREFIX ${path_install} CACHE PATH "default install path" FORCE)
+        endif(MSVC)
+    endif(WIN32)
+endif()
+
+# Warning if CMAKE_INSTALL_PREFIX is empty. Likely set by using the wrong environment variable.
+if(NOT CMAKE_INSTALL_PREFIX)
+    message(
+        WARNING
+            "CMAKE_INSTALL_PREFIX is set to nothing. If you are using an environment variable for handling prefix paths, that variable might not have been set before using it with CMake to set the CMAKE_INSTALL_PREFIX option."
+    )
+endif()
+
+# Check to make sure the install prefix isn't the build folder, if it is, build errors will happen
+get_filename_component(tmp_install_prefix "${CMAKE_INSTALL_PREFIX}" REALPATH)
+get_filename_component(tmp_proj_bindir "${PROJECT_BINARY_DIR}" REALPATH)
+# Windows paths are case insensitive
+if(WIN32)
+    string(TOLOWER "${tmp_install_prefix}" tmp_install_prefix)
+    string(TOLOWER "${tmp_proj_bindir}" tmp_proj_bindir)
+endif()
+if(tmp_install_prefix STREQUAL tmp_proj_bindir)
+    message(FATAL_ERROR "CMAKE_INSTALL_PREFIX must not be set to the build folder")
+endif()
+
+if(MSYS
+   OR CYGWIN
+   OR UNIX
+   OR APPLE
+)
+    set(UNIX_LIKE TRUE)
+endif()
+
+# Set the build output paths
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" CACHE PATH
+                                                                           "Archive output dir."
+        )
+    endif()
+    if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" CACHE PATH
+                                                                           "Library output dir."
+        )
+    endif()
+    if(NOT CMAKE_PDB_OUTPUT_DIRECTORY)
+        set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+            CACHE PATH "PDB (MSVC debug symbol)output dir."
+        )
+    endif()
+    if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+            CACHE PATH "Executable/dll output dir."
+        )
+    endif()
+endif()
+
+# Prohibit in-source build
+if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
+    message(
+        FATAL_ERROR
+            "In-source build is not supported. Please, use an empty directory for building the project."
+    )
+endif()
diff --git a/config/cmake/commonRPath.cmake b/config/cmake/commonRPath.cmake
new file mode 100644
index 0000000000..addadd1676
--- /dev/null
+++ b/config/cmake/commonRPath.cmake
@@ -0,0 +1,49 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
+# National Security, LLC; Alliance for Sustainable Energy, LLC.
+# See the top-level NOTICE for additional details.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# setup common rpath configuration
+
+# -------------------------------------------------------------
+# setting the RPATH
+# -------------------------------------------------------------
+if(NOT DEFINED CMAKE_MACOSX_RPATH)
+    set(CMAKE_MACOSX_RPATH ON)
+endif()
+
+# add the automatically determined parts of the RPATH which point to directories outside the build
+# tree to the install RPATH
+if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
+    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
+
+# Add the local directory to the rpath
+if(NOT APPLE)
+    list(APPEND CMAKE_INSTALL_RPATH $ORIGIN)
+    list(APPEND CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
+else()
+    list(APPEND CMAKE_INSTALL_RPATH "@loader_path")
+    list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR}")
+    list(APPEND CMAKE_INSTALL_RPATH "@executable_path")
+    list(APPEND CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}")
+endif()
+
+# the RPATH to be used when installing, but only if it's not a system directory
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+     "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" isSystemDir
+)
+if(isSystemDir STREQUAL "-1")
+    list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+endif()
+
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+     "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir
+)
+if(isSystemDir STREQUAL "-1")
+    list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+endif()
diff --git a/config/cmake/compiler_flags.cmake b/config/cmake/compiler_flags.cmake
index 5238cfe66f..a910bc37c6 100644
--- a/config/cmake/compiler_flags.cmake
+++ b/config/cmake/compiler_flags.cmake
@@ -7,8 +7,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 include(CMakeDependentOption)
-if (WIN32)
-# from https://stackoverflow.com/a/40217291/2019765 by squareskittles
+if(WIN32)
+    # from https://stackoverflow.com/a/40217291/2019765 by squareskittles
     macro(get_WIN32_WINNT version)
         if(CMAKE_SYSTEM_VERSION)
             set(ver ${CMAKE_SYSTEM_VERSION})
@@ -28,14 +28,19 @@ if (WIN32)
     endmacro(get_WIN32_WINNT)
 endif()
 
+cmake_dependent_option(
+    ${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS
+    "disable compiler warning for ${CMAKE_PROJECT_NAME} build" ON
+    "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF
+)
 
-cmake_dependent_option(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS
-       "disable compiler warning for ${CMAKE_PROJECT_NAME} build" ON "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
-
-cmake_dependent_option(${PROJECT_NAME}_ENABLE_ERROR_ON_WARNINGS
-       "generate a compiler error for any warning encountered" OFF "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
+cmake_dependent_option(
+    ${PROJECT_NAME}_ENABLE_ERROR_ON_WARNINGS
+    "generate a compiler error for any warning encountered" OFF
+    "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF
+)
 
-if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     mark_as_advanced(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS)
     mark_as_advanced(${PROJECT_NAME}_ENABLE_ERROR_ON_WARNINGS)
 endif()
@@ -43,15 +48,15 @@ endif()
 # -------------------------------------------------------------
 # Setup compiler options and configurations
 # -------------------------------------------------------------
-if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-   message(STATUS "setting up for ${CMAKE_CXX_COMPILER_ID} on ${CMAKE_SYSTEM}")
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    message(STATUS "setting up for ${CMAKE_CXX_COMPILER_ID} on ${CMAKE_SYSTEM}")
 endif()
 
 if(NOT TARGET compile_flags_target)
     add_library(compile_flags_target INTERFACE)
 endif()
 
-if (NOT TARGET build_flags_target)
+if(NOT TARGET build_flags_target)
     add_library(build_flags_target INTERFACE)
 endif()
 
@@ -62,31 +67,18 @@ target_compile_options(
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:$<$<BOOL:${${PROJECT_NAME}_ENABLE_ERROR_ON_WARNINGS}>:-Werror>>
 )
 
-target_compile_options(
-    compile_flags_target
-    INTERFACE
-       ${${PROJECT_NAME}_EXTRA_COMPILE_FLAGS}
-)
+target_compile_options(compile_flags_target INTERFACE ${${PROJECT_NAME}_EXTRA_COMPILE_FLAGS})
 
-target_compile_options(
-    build_flags_target
-    INTERFACE
-       ${${PROJECT_NAME}_EXTRA_BUILD_FLAGS}
-)
+target_compile_options(build_flags_target INTERFACE ${${PROJECT_NAME}_EXTRA_BUILD_FLAGS})
 
 if(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS)
     target_compile_options(
-        compile_flags_target
-        INTERFACE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -pedantic>
+        compile_flags_target INTERFACE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -pedantic>
     )
     target_compile_options(
         compile_flags_target
-        INTERFACE
-            $<$<COMPILE_LANGUAGE:CXX>:$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wextra
-            -Wstrict-aliasing=1
-            -Wunreachable-code
-            -Woverloaded-virtual
-            -Wundef>>
+        INTERFACE $<$<COMPILE_LANGUAGE:CXX>:$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wextra
+                  -Wstrict-aliasing=1 -Wunreachable-code -Woverloaded-virtual -Wundef>>
     )
 
     target_compile_options(
@@ -98,48 +90,45 @@ if(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS)
         INTERFACE $<$<COMPILE_LANGUAGE:CXX>:$<$<CXX_COMPILER_ID:GNU>:-Wcast-align -Wlogical-op>>
     )
     # target_compile_options(compile_flags_target INTERFACE
-    # $<$<COMPILE_LANGUAGE:CXX>:-Wredundant-decls>)
-    # target_compile_options(compile_flags_target INTERFACE
-    # $<$<COMPILE_LANGUAGE:CXX>:-Wstrict-overflow=5>)
-
+    # $<$<COMPILE_LANGUAGE:CXX>:-Wredundant-decls>) target_compile_options(compile_flags_target
+    # INTERFACE $<$<COMPILE_LANGUAGE:CXX>:-Wstrict-overflow=5>)
 
     # this option produces a number of warnings in third party libraries
     # target_compile_options(compile_flags_target INTERFACE
-    # $<$<COMPILE_LANGUAGE:CXX>:$<$<CXX_COMPILER_ID:GNU>:-Wold-style-cast>>) this
-    # options produces lots of warning but is useful for checking every once in a while
-    # with Clang, GCC warning notices with this aren't as useful
-    # target_compile_options(compile_flags_target INTERFACE
-    # $<$<COMPILE_LANGUAGE:CXX>:-Wpadded>) add some gnu specific options if the compiler
-    # is newer
+    # $<$<COMPILE_LANGUAGE:CXX>:$<$<CXX_COMPILER_ID:GNU>:-Wold-style-cast>>) this options produces
+    # lots of warning but is useful for checking every once in a while with Clang, GCC warning
+    # notices with this aren't as useful target_compile_options(compile_flags_target INTERFACE
+    # $<$<COMPILE_LANGUAGE:CXX>:-Wpadded>) add some gnu specific options if the compiler is newer
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        # this option produces a number of warnings in third party libraries but useful
-        # for checking for any internal usages
-            target_compile_options(
-                compile_flags_target
-                INTERFACE
-                    $<$<COMPILE_LANGUAGE:CXX>:-Wduplicated-cond -Wclass-memaccess -Wnull-dereference -Wshadow -Wimplicit-fallthrough=2 -Wno-psabi -Wno-deprecated-declarations>
-            )
+        # this option produces a number of warnings in third party libraries but useful for checking
+        # for any internal usages
+        target_compile_options(
+            compile_flags_target
+            INTERFACE $<$<COMPILE_LANGUAGE:CXX>:-Wduplicated-cond
+                      -Wclass-memaccess
+                      -Wnull-dereference
+                      -Wshadow
+                      -Wimplicit-fallthrough=2
+                      -Wno-psabi
+                      -Wno-deprecated-declarations>
+        )
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
             target_link_libraries(build_flags_target INTERFACE "stdc++fs")
 
         endif()
     endif()
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        target_compile_options(compile_flags_target INTERFACE $<$<COMPILE_LANGUAGE:CXX>:-Wshadow>)
         target_compile_options(
-                compile_flags_target
-                INTERFACE  $<$<COMPILE_LANGUAGE:CXX>:-Wshadow>
-            )
+            compile_flags_target INTERFACE -Wdocumentation -Wno-documentation-deprecated-sync
+        )
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0)
+            message(STATUS "clang>13")
             target_compile_options(
-                compile_flags_target
-                INTERFACE -Wdocumentation -Wno-documentation-deprecated-sync
+                compile_flags_target INTERFACE -Wreserved-identifier -Wunused-but-set-parameter
+                                               -Wunused-but-set-variable
             )
-       if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0)
-       message(STATUS "clang>13")
-            target_compile_options(
-                compile_flags_target
-                INTERFACE -Wreserved-identifier -Wunused-but-set-parameter -Wunused-but-set-variable
-            )
-        endif ()
+        endif()
     endif()
 endif(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS)
 
@@ -148,8 +137,7 @@ endif(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS)
 # -------------------------------------------------------------
 if(MSVC)
     target_compile_options(
-        compile_flags_target
-        INTERFACE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /MP
+        compile_flags_target INTERFACE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /MP
     )
 
     # these next two should be global
@@ -157,17 +145,26 @@ if(MSVC)
     target_compile_options(build_flags_target INTERFACE /EHsc)
 
     if(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS)
-        target_compile_options(compile_flags_target INTERFACE /W4 /sdl /wd4244 /wd4503 /wd4592 /wd4455)
+        target_compile_options(
+            compile_flags_target
+            INTERFACE /W4
+                      /sdl
+                      /wd4244
+                      /wd4503
+                      /wd4592
+                      /wd4455
+        )
     endif(${PROJECT_NAME}_ENABLE_EXTRA_COMPILER_WARNINGS)
     get_win32_winnt(COPTION_WIN32_WINNT_DEFAULT)
-    target_compile_options(compile_flags_target INTERFACE "-D_WIN32_WINNT=${COPTION_WIN32_WINNT_DEFAULT}")
+    target_compile_options(
+        compile_flags_target INTERFACE "-D_WIN32_WINNT=${COPTION_WIN32_WINNT_DEFAULT}"
+    )
     message(
-        STATUS
-            "Detected _WIN32_WINNT from CMAKE_SYSTEM_VERSION: ${COPTION_WIN32_WINNT_DEFAULT}"
+        STATUS "Detected _WIN32_WINNT from CMAKE_SYSTEM_VERSION: ${COPTION_WIN32_WINNT_DEFAULT}"
     )
     if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-         # disable some irrelevant integer overflow warnings on 32 bit systems
-         target_compile_options(compile_flags_target INTERFACE /wd4307 /wd4309)
+        # disable some irrelevant integer overflow warnings on 32 bit systems
+        target_compile_options(compile_flags_target INTERFACE /wd4307 /wd4309)
     endif()
 else(MSVC)
     option(USE_LIBCXX "Use Libc++ vs as opposed to the default" OFF)
@@ -177,20 +174,22 @@ else(MSVC)
         add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++>)
         link_libraries("-stdlib=libc++")
         link_libraries("c++abi")
-        target_compile_options(build_flags_target INTERFACE $<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++>)
+        target_compile_options(
+            build_flags_target INTERFACE $<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++>
+        )
         target_link_libraries(build_flags_target INTERFACE "-stdlib=libc++")
         target_link_libraries(build_flags_target INTERFACE "c++abi")
     endif(USE_LIBCXX)
 endif()
 
-## remove potential duplicates from the flags
+# remove potential duplicates from the flags
 
 get_target_property(compile_flags_list compile_flags_target INTERFACE_COMPILE_OPTIONS)
 list(REMOVE_DUPLICATES compile_flags_list)
 set_property(TARGET compile_flags_target PROPERTY INTERFACE_COMPILE_OPTIONS ${compile_flags_list})
 
 get_target_property(link_flags_list compile_flags_target INTERFACE_LINK_OPTIONS)
-if (link_flags_list)
+if(link_flags_list)
     list(REMOVE_DUPLICATES link_flags_list)
     set_property(TARGET compile_flags_target PROPERTY INTERFACE_LINK_OPTIONS ${link_flags_list})
 endif()
@@ -200,23 +199,20 @@ endif()
 # -------------------------------------------------------------
 include(CheckLatestCXXStandardOption)
 
-message(
-        STATUS "setting helics C++ standard build option to \"${CXX_STANDARD_FLAG}\""
-    )
+message(STATUS "setting helics C++ standard build option to \"${CXX_STANDARD_FLAG}\"")
 if(CXX_STANDARD_FLAG)
-   if(MSVC)
-       add_compile_options(${CXX_STANDARD_FLAG})
-       target_compile_options(build_flags_target INTERFACE ${CXX_STANDARD_FLAG})
-   else(MSVC)
-       add_compile_options($<$<COMPILE_LANGUAGE:CXX>:${CXX_STANDARD_FLAG}>)
-       target_compile_options(
-           build_flags_target
-           INTERFACE $<$<COMPILE_LANGUAGE:CXX>:${CXX_STANDARD_FLAG}>
-       )
-   endif(MSVC)
+    if(MSVC)
+        add_compile_options(${CXX_STANDARD_FLAG})
+        target_compile_options(build_flags_target INTERFACE ${CXX_STANDARD_FLAG})
+    else(MSVC)
+        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:${CXX_STANDARD_FLAG}>)
+        target_compile_options(
+            build_flags_target INTERFACE $<$<COMPILE_LANGUAGE:CXX>:${CXX_STANDARD_FLAG}>
+        )
+    endif(MSVC)
 endif(CXX_STANDARD_FLAG)
 
-## remove potential duplicates from the flags
+# remove potential duplicates from the flags
 get_target_property(build_flags_list build_flags_target INTERFACE_COMPILE_OPTIONS)
 list(REMOVE_DUPLICATES build_flags_list)
 set_property(TARGET build_flags_target PROPERTY INTERFACE_COMPILE_OPTIONS ${build_flags_list})
diff --git a/config/cmake/copy_key_files.cmake b/config/cmake/copy_key_files.cmake
index 0b23137931..3bd5d7fb5d 100644
--- a/config/cmake/copy_key_files.cmake
+++ b/config/cmake/copy_key_files.cmake
@@ -12,7 +12,8 @@ macro(copy_key_files_to_target_location target)
 
         foreach(keyfile IN LISTS KEY_LIBRARY_FILES)
             add_custom_command(
-                TARGET ${target} POST_BUILD # Adds a post-build event to api tests
+                TARGET ${target}
+                POST_BUILD # Adds a post-build event to api tests
                 COMMAND
                     ${CMAKE_COMMAND} -E copy_if_different # which executes "cmake - E
                                                           # copy_if_different..."
@@ -24,7 +25,8 @@ macro(copy_key_files_to_target_location target)
 
         if(TARGET libzmq)
             add_custom_command(
-                TARGET ${target} POST_BUILD # Adds a post-build event to core tests
+                TARGET ${target}
+                POST_BUILD # Adds a post-build event to core tests
                 COMMAND
                     ${CMAKE_COMMAND} -E copy_if_different # which executes "cmake - E
                                                           # copy_if_different..."
@@ -38,34 +40,22 @@ endmacro()
 
 macro(copy_shared_target target shared_target)
     add_custom_command(
-        TARGET ${target} POST_BUILD # Adds a post-build event to api tests
+        TARGET ${target}
+        POST_BUILD # Adds a post-build event to api tests
         COMMAND
-            ${CMAKE_COMMAND} -E copy_if_different # which executes "cmake - E
-                                                  # copy_if_different..."
+            ${CMAKE_COMMAND} -E copy_if_different # which executes "cmake - E copy_if_different..."
             "$<TARGET_FILE:${shared_target}>" # <--this is in- file
             "$<TARGET_FILE_DIR:${target}>/"
     ) # <--this is out- file path
 endmacro()
 
 macro(install_key_files_with_comp comp)
-    install(
-        FILES $<TARGET_FILE:helics>
-        DESTINATION ${comp}
-        COMPONENT ${comp}
-    )
-    install(
-        FILES ${KEY_LIBRARY_FILES}
-        DESTINATION ${comp}
-        COMPONENT ${comp}
-    )
+    install(FILES $<TARGET_FILE:helics> DESTINATION ${comp} COMPONENT ${comp})
+    install(FILES ${KEY_LIBRARY_FILES} DESTINATION ${comp} COMPONENT ${comp})
 
     if(WIN32)
         if(TARGET libzmq)
-            install(
-                FILES $<TARGET_FILE:libzmq>
-                DESTINATION ${comp}
-                COMPONENT ${comp}
-            )
+            install(FILES $<TARGET_FILE:libzmq> DESTINATION ${comp} COMPONENT ${comp})
         endif()
 
     endif(WIN32)
diff --git a/config/cmake/escape_string.cmake b/config/cmake/escape_string.cmake
index 14aabcd37a..9a8773c462 100644
--- a/config/cmake/escape_string.cmake
+++ b/config/cmake/escape_string.cmake
@@ -16,8 +16,8 @@ function(escape_string outstring instring)
 
     # string(REGEX REPLACE ";" "\\\\;" ${outstring} ${outstring})
     string(REGEX REPLACE " " "\\\\ " OUT_STRING_TEMP ${OUT_STRING_TEMP})
-    # string(REGEX REPLACE "\\\"" "\\\\"" OUT_STRING_TEMP ${OUT_STRING_TEMP})
-    # message(STATUS "${OUT_STRING_TEMP} :: ${instring}")
+    # string(REGEX REPLACE "\\\"" "\\\\"" OUT_STRING_TEMP ${OUT_STRING_TEMP}) message(STATUS
+    # "${OUT_STRING_TEMP} :: ${instring}")
 
     # message(STATUS "${${outstring}}")
 
diff --git a/config/cmake/extraMacros.cmake b/config/cmake/extraMacros.cmake
index eb620749c4..168763c575 100644
--- a/config/cmake/extraMacros.cmake
+++ b/config/cmake/extraMacros.cmake
@@ -1,5 +1,5 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# Copyright (c) 2017-2020, Battelle Memorial Institute; Lawrence Livermore
+# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
 # National Security, LLC; Alliance for Sustainable Energy, LLC.
 # See the top-level NOTICE for additional details.
 # All rights reserved.
@@ -11,10 +11,9 @@
 # MACRO definitions
 # -------------------------------------------------------------
 
-# Macros to hide/show cached variables. These two macros can be used to "hide" or "show"
-# in the list of cached variables various variables and/or options that depend on other
-# options. Note that once a variable is modified, it will preserve its value (hiding it
-# merely makes it internal)
+# Macros to hide/show cached variables. These two macros can be used to "hide" or "show" in the list
+# of cached variables various variables and/or options that depend on other options. Note that once
+# a variable is modified, it will preserve its value (hiding it merely makes it internal)
 
 macro(HIDE_VARIABLE var)
     if(DEFINED ${var})
@@ -22,13 +21,7 @@ macro(HIDE_VARIABLE var)
     endif(DEFINED ${var})
 endmacro(HIDE_VARIABLE)
 
-macro(
-    SHOW_VARIABLE
-    var
-    type
-    doc
-    default
-)
+macro(SHOW_VARIABLE var type doc default)
     if(DEFINED ${var})
         set(${var} "${${var}}" CACHE "${type}" "${doc}" FORCE)
     else(DEFINED ${var})
@@ -36,12 +29,12 @@ macro(
     endif(DEFINED ${var})
 endmacro(SHOW_VARIABLE)
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~
 # the following code is derived from the cmake cmakeDependentOption macro
 #
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~
 
 #[=======================================================================[.rst:
 CMakeConditionalOption
@@ -69,16 +62,17 @@ retains its old value.
 macro(CMAKE_CONDITIONAL_OPTION option doc condition)
     set(${option}_ON 1)
     foreach(d ${depends})
-      string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
-      if(${CMAKE_DEPENDENT_OPTION_DEP})
-      else()
-        set(${option}_ON 0)
-      endif()
+        string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
+        if(${CMAKE_DEPENDENT_OPTION_DEP})
+
+        else()
+            set(${option}_ON 0)
+        endif()
     endforeach()
     if(${option}_ON)
-      option(${option} "${doc}" ON)
+        option(${option} "${doc}" ON)
     else()
-       option(${option} "${doc}" OFF)
+        option(${option} "${doc}" OFF)
     endif()
 endmacro()
 
@@ -105,28 +99,37 @@ the USE_FOO option is saved so that when the option is re-enabled it
 retains its old value.
 #]=======================================================================]
 
-macro(CMAKE_DEPENDENT_ADVANCED_OPTION option doc default depends force)
-  if(${option}_ISSET MATCHES "^${option}_ISSET$")
-    set(${option}_AVAILABLE 1)
-    foreach(d ${depends})
-      string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
-      if(${CMAKE_DEPENDENT_OPTION_DEP})
-      else()
-        set(${option}_AVAILABLE 0)
-      endif()
-    endforeach()
-    if(${option}_AVAILABLE)
-      option(${option} "${doc}" "${default}")
-      set(${option} "${${option}}" CACHE BOOL "${doc}" FORCE)
-      mark_as_advanced(${option})
+macro(
+    CMAKE_DEPENDENT_ADVANCED_OPTION
+    option
+    doc
+    default
+    depends
+    force
+)
+    if(${option}_ISSET MATCHES "^${option}_ISSET$")
+        set(${option}_AVAILABLE 1)
+        foreach(d ${depends})
+            string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
+            if(${CMAKE_DEPENDENT_OPTION_DEP})
+
+            else()
+                set(${option}_AVAILABLE 0)
+            endif()
+        endforeach()
+        if(${option}_AVAILABLE)
+            option(${option} "${doc}" "${default}")
+            set(${option} "${${option}}" CACHE BOOL "${doc}" FORCE)
+            mark_as_advanced(${option})
+        else()
+            if(${option} MATCHES "^${option}$")
+
+            else()
+                set(${option} "${${option}}" CACHE INTERNAL "${doc}")
+            endif()
+            set(${option} ${force})
+        endif()
     else()
-      if(${option} MATCHES "^${option}$")
-      else()
-        set(${option} "${${option}}" CACHE INTERNAL "${doc}")
-      endif()
-      set(${option} ${force})
+        set(${option} "${${option}_ISSET}")
     endif()
-  else()
-    set(${option} "${${option}_ISSET}")
-  endif()
 endmacro()
diff --git a/config/cmake/updateGitSubmodules.cmake b/config/cmake/updateGitSubmodules.cmake
index a97f50fb6a..095ebb1a98 100644
--- a/config/cmake/updateGitSubmodules.cmake
+++ b/config/cmake/updateGitSubmodules.cmake
@@ -15,63 +15,87 @@ if(GIT_FOUND AND (GIT_VERSION_STRING VERSION_GREATER "1.5.2"))
         option(${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE "Checkout and update git submodules" ON)
         mark_as_advanced(${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
     else()
-        message(STATUS "${PROJECT_SOURCE_DIR} is not a Git repository. Clone ${PROJECT_NAME} with Git or ensure you get copies of all the Git submodules code.")
+        message(
+            STATUS
+                "${PROJECT_SOURCE_DIR} is not a Git repository. Clone ${PROJECT_NAME} with Git or ensure you get copies of all the Git submodules code."
+        )
     endif()
 endif()
 
 macro(submod_update_all)
-  if (${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
-    message(STATUS "Git Submodule Update")
-            execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init
-                            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                            RESULT_VARIABLE GIT_RESULT
-                            OUTPUT_VARIABLE GIT_OUTPUT)
-      if(GIT_RESULT)
-        message(WARNING "Automatic submodule checkout with `git submodule --init` failed with error ${GIT_RESULT} and output ${GIT_OUTPUT}. Checkout the submodules before building.")
-      endif()
+    if(${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
+        message(STATUS "Git Submodule Update")
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} submodule update --init
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            RESULT_VARIABLE GIT_RESULT
+            OUTPUT_VARIABLE GIT_OUTPUT
+        )
+        if(GIT_RESULT)
+            message(
+                WARNING
+                    "Automatic submodule checkout with `git submodule --init` failed with error ${GIT_RESULT} and output ${GIT_OUTPUT}. Checkout the submodules before building."
+            )
+        endif()
     else()
-     message(WARNING "SUBMODULE update has been disabled")
-   endif()
+        message(WARNING "SUBMODULE update has been disabled")
+    endif()
 endmacro()
 
 macro(submod_update target)
-  if (${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
-     message(STATUS "Git Submodule Update ${target}")
-     execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init -- ${target}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        RESULT_VARIABLE GIT_RESULT
-        OUTPUT_VARIABLE GIT_OUTPUT)
-     if(GIT_RESULT)
-         message(WARNING "Automatic submodule checkout with `git submodule --init -- $[target}` failed with error ${GIT_RESULT} and output ${GIT_OUTPUT}. Checkout the submodules before building.")
-     endif()
-   else()
-     message(WARNING "SUBMODULE update has been disabled")
-   endif()
+    if(${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
+        message(STATUS "Git Submodule Update ${target}")
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} submodule update --init -- ${target}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            RESULT_VARIABLE GIT_RESULT
+            OUTPUT_VARIABLE GIT_OUTPUT
+        )
+        if(GIT_RESULT)
+            message(
+                WARNING
+                    "Automatic submodule checkout with `git submodule --init -- $[target}` failed with error ${GIT_RESULT} and output ${GIT_OUTPUT}. Checkout the submodules before building."
+            )
+        endif()
+    else()
+        message(WARNING "SUBMODULE update has been disabled")
+    endif()
 endmacro()
 
 function(check_submodule_status)
-    if (${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule status
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                RESULT_VARIABLE GIT_RESULT
-                OUTPUT_VARIABLE GIT_OUTPUT)
+    if(${PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} submodule status
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            RESULT_VARIABLE GIT_RESULT
+            OUTPUT_VARIABLE GIT_OUTPUT
+        )
 
-        if (GIT_RESULT)
-            message(WARNING "Automatic submodule verification with `git submodule status` failed with error ${GIT_RESULT} and output ${GIT_OUTPUT}. Verify submodules before building.")
-        endif ()
+        if(GIT_RESULT)
+            message(
+                WARNING
+                    "Automatic submodule verification with `git submodule status` failed with error ${GIT_RESULT} and output ${GIT_OUTPUT}. Verify submodules before building."
+            )
+        endif()
 
-        if (WIN32 AND NOT (MSYS OR CYGWIN))
-            execute_process(COMMAND powershell "-c" "echo '${GIT_OUTPUT}' | Select-String -Pattern '^[-\\|+\\|U].*'"
-                    OUTPUT_VARIABLE SUBMODULE_STATUS
-                    )
-        else ()
-            execute_process(COMMAND bash "-c" "echo '${GIT_OUTPUT}' | grep '^[-\\|+\\|U].*'"
-                    OUTPUT_VARIABLE SUBMODULE_STATUS
-                    )
-        endif ()
-        if (NOT "${SUBMODULE_STATUS}" STREQUAL "")
-            message(WARNING "Submodules are not up to date. Update submodules by running `git submodule update --init` before building HELICS."
-            "\nOut of date submodules:\n ${SUBMODULE_STATUS}")
-        endif ()
-    endif ()
+        if(WIN32 AND NOT (MSYS OR CYGWIN))
+            execute_process(
+                COMMAND powershell "-c"
+                        "echo '${GIT_OUTPUT}' | Select-String -Pattern '^[-\\|+\\|U].*'"
+                OUTPUT_VARIABLE SUBMODULE_STATUS
+            )
+        else()
+            execute_process(
+                COMMAND bash "-c" "echo '${GIT_OUTPUT}' | grep '^[-\\|+\\|U].*'"
+                OUTPUT_VARIABLE SUBMODULE_STATUS
+            )
+        endif()
+        if(NOT "${SUBMODULE_STATUS}" STREQUAL "")
+            message(
+                WARNING
+                    "Submodules are not up to date. Update submodules by running `git submodule update --init` before building HELICS."
+                    "\nOut of date submodules:\n ${SUBMODULE_STATUS}"
+            )
+        endif()
+    endif()
 endfunction()
diff --git a/config/cmake/version_describe.cmake b/config/cmake/version_describe.cmake
index 555a097454..8c025973c0 100644
--- a/config/cmake/version_describe.cmake
+++ b/config/cmake/version_describe.cmake
@@ -9,29 +9,25 @@
 
 find_package(Git)
 
-# this function is to get a nicely formatted build string for later reference in a human
-# readable format that has some utility for automation. the resulting format would be
-# empty if the build matches a tag exactly, and otherwise <branch_name>-<git
-# hash>[-dirty]  if dirty is present there are uncommitted changes in the repo called
-# like git_version_describe(${PROJECT_SOURCE_DIR} result)  then result will contain the
-# description string
+# this function is to get a nicely formatted build string for later reference in a human readable
+# format that has some utility for automation. the resulting format would be empty if the build
+# matches a tag exactly, and otherwise <branch_name>-<git hash>[-dirty]  if dirty is present there
+# are uncommitted changes in the repo called like git_version_describe(${PROJECT_SOURCE_DIR} result)
+# then result will contain the description string
 
 function(git_version_describe source_path result)
     set(tag_desc "")
     # message(STATUS "Source ${source_path}")
     if(GIT_FOUND)
         execute_process(
-            COMMAND
-                ${GIT_EXECUTABLE} -C ${source_path} --work-tree ${source_path} describe
-                --tags
+            COMMAND ${GIT_EXECUTABLE} -C ${source_path} --work-tree ${source_path} describe --tags
             OUTPUT_VARIABLE TAG_DESCRIPTION
             ERROR_VARIABLE TAGGING_ERROR
             OUTPUT_STRIP_TRAILING_WHITESPACE
         )
         if(TAGGING_ERROR)
             execute_process(
-                COMMAND ${GIT_EXECUTABLE} -C ${source_path} --work-tree ${source_path}
-                        describe
+                COMMAND ${GIT_EXECUTABLE} -C ${source_path} --work-tree ${source_path} describe
                 OUTPUT_VARIABLE TAG_DESCRIPTION
                 ERROR_VARIABLE TAGGING_ERROR
                 OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -39,9 +35,8 @@ function(git_version_describe source_path result)
         endif()
         if(TAGGING_ERROR)
             execute_process(
-                COMMAND
-                    ${GIT_EXECUTABLE} -C ${source_path} --work-tree ${source_path}
-                    describe --all --tags --dirty --long
+                COMMAND ${GIT_EXECUTABLE} -C ${source_path} --work-tree ${source_path} describe
+                        --all --tags --dirty --long
                 OUTPUT_VARIABLE TAG_DESCRIPTION
                 ERROR_VARIABLE TAGGING_ERROR
                 OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -55,9 +50,8 @@ function(git_version_describe source_path result)
                 if(last_dash_loc GREATER 0)
                     string(SUBSTRING ${TAG_DESCRIPTION} ${last_dash_loc} -1 hash_string)
                     execute_process(
-                        COMMAND
-                            ${GIT_EXECUTABLE} -C ${source_path} --work-tree
-                            ${source_path} describe --all --tags --dirty
+                        COMMAND ${GIT_EXECUTABLE} -C ${source_path} --work-tree ${source_path}
+                                describe --all --tags --dirty
                         OUTPUT_VARIABLE TAG_DESCRIPTION2
                         ERROR_VARIABLE TAGGING_ERROR
                         OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -69,9 +63,7 @@ function(git_version_describe source_path result)
                     if(hash_loc LESS 0)
                         string(FIND ${TAG_DESCRIPTION2} "-dirty" dirty_loc)
                         if(dirty_loc GREATER 0)
-                            string(SUBSTRING ${TAG_DESCRIPTION2} 0 ${dirty_loc}
-                                             tag_desc
-                            )
+                            string(SUBSTRING ${TAG_DESCRIPTION2} 0 ${dirty_loc} tag_desc)
                             string(APPEND tag_desc ${hash_string} "-dirty")
                         else()
                             string(APPEND tag_desc ${TAG_DESCRIPTION2} ${hash_string})
@@ -87,14 +79,8 @@ function(git_version_describe source_path result)
             endif()
         endif()
 
-        set(${result}
-            ${tag_desc}
-            PARENT_SCOPE
-        )
+        set(${result} ${tag_desc} PARENT_SCOPE)
     else(GIT_FOUND)
-        set(${result}
-            ""
-            PARENT_SCOPE
-        )
+        set(${result} "" PARENT_SCOPE)
     endif(GIT_FOUND)
 endfunction()
diff --git a/docs/user-guide/installation/helics_cmake_options.md b/docs/user-guide/installation/helics_cmake_options.md
index 676bc6dbf0..ad7e3cd6d9 100644
--- a/docs/user-guide/installation/helics_cmake_options.md
+++ b/docs/user-guide/installation/helics_cmake_options.md
@@ -98,3 +98,4 @@ There are a few options in the CMake system that are not visible in the GUI they
 - `HELICS_DISABLE_GIT_OPERATIONS` : will turn off any of the helper tools that require git, this is useful in a couple cases for building packages and other situations where updates shouldn't be checked and no modifications should be made.
 - `HELICS_SKIP_ZMQ_INSTALL`: This is only relevant if ZMQ is built as part of the compilation process, but it skips the installation of zmq as part of HELICS install in that case.
 - `HELICS_BENCHMARK_SHIFT_FACTOR`: For running the benchmarks this shift factor can be used to scale the number of federates used for the benchmark tests. If used it is required to be a number and is power of 2 shift from nominal values. For example for a small system a shift factor of -1 or -2 might be appropriate for the benchmarks not to take too long. The default for systems with 4 or fewer cores is `-1` and 0 for larger compute systems. For small 2 core systems a value of -2 might be appropriate. For some very large systems a bigger value might be able to be used.
+- `HELICS_HIDE_CMAKE_VARIABLES`: When using HELICS as a subproject in a CMake build this option can be enabled to hide all HELICS related variables in CMake so they won't show up in the CMake GUI.
diff --git a/interfaces/java/addLoadLibraryCommand.cmake b/interfaces/java/addLoadLibraryCommand.cmake
index 8f87aeddae..c11aafae87 100644
--- a/interfaces/java/addLoadLibraryCommand.cmake
+++ b/interfaces/java/addLoadLibraryCommand.cmake
@@ -7,21 +7,24 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-# addLoadLibraryCommand.cmake
-#adds a load library function to the helics.java
+# addLoadLibraryCommand.cmake adds a load library function to the helics.java
 
-if (NOT LIBRARY_FILE)
-set(LIBRARY_FILE helics)
+if(NOT LIBRARY_FILE)
+    set(LIBRARY_FILE helics)
 else()
-get_filename_component(LIBRARY_FILE ${LIBRARY_FILE} NAME_WE)
-STRING(REGEX REPLACE "^lib" "" LIBRARY_FILE ${LIBRARY_FILE})
+    get_filename_component(LIBRARY_FILE ${LIBRARY_FILE} NAME_WE)
+    string(REGEX REPLACE "^lib" "" LIBRARY_FILE ${LIBRARY_FILE})
 endif()
 file(READ helicsJNI.java HELICS_JNI_SOURCE)
 string(FIND "${HELICS_JNI_SOURCE}" "System.loadLibrary" ALREADY_LOADED)
-if (${ALREADY_LOADED} LESS 0)
-string(REPLACE "public class helicsJNI {"
-       "public class helicsJNI {\n  static {\n    System.loadLibrary\(\"${LIBRARY_FILE}\"\);\n  }" HELICS_JNI_SOURCE
-       "${HELICS_JNI_SOURCE}")
+if(${ALREADY_LOADED} LESS 0)
+    string(
+        REPLACE
+            "public class helicsJNI {"
+            "public class helicsJNI {\n  static {\n    System.loadLibrary\(\"${LIBRARY_FILE}\"\);\n  }"
+            HELICS_JNI_SOURCE
+            "${HELICS_JNI_SOURCE}"
+    )
 
-file(WRITE helicsJNI.java "${HELICS_JNI_SOURCE}")
+    file(WRITE helicsJNI.java "${HELICS_JNI_SOURCE}")
 endif()
diff --git a/interfaces/java/installJar.cmake b/interfaces/java/installJar.cmake
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/interfaces/java/javaSwigGenerateOnly.cmake b/interfaces/java/javaSwigGenerateOnly.cmake
index 2f08df93f6..d32b26c46c 100644
--- a/interfaces/java/javaSwigGenerateOnly.cmake
+++ b/interfaces/java/javaSwigGenerateOnly.cmake
@@ -7,44 +7,37 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#File used to generate the Java interface and overwrite the existing files if requested
+# File used to generate the Java interface and overwrite the existing files if requested
 
 if(SWIG_VERSION VERSION_GREATER "4.0.0")
-  set(SWIG_DOXYGEN_FLAG "-doxygen")
+    set(SWIG_DOXYGEN_FLAG "-doxygen")
 endif()
 
-  get_filename_component(helics.i_INCLUDE_DIR "${HELICS_SWIG_helics.i_FILE}" DIRECTORY)
+get_filename_component(helics.i_INCLUDE_DIR "${HELICS_SWIG_helics.i_FILE}" DIRECTORY)
 
-  # custom command for building the wrap file
-  add_custom_command(
+# custom command for building the wrap file
+add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/helicsJava.c
     COMMAND
-      "${SWIG_EXECUTABLE}" "-java" "-package" "com.java.helics" -o "helicsJava.c" "${SWIG_DOXYGEN_FLAG}"
-      "-I${HELICS_SOURCE_DIR}/src/helics/shared_api_library/backup/"
-      "-I${helics.i_INCLUDE_DIR}"
-      ${CMAKE_CURRENT_SOURCE_DIR}/helicsJava.i
-    DEPENDS
-      ${HELICS_SWIG_helics.i_FILE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/helicsJava.i
-      ${HELICS_SOURCE_DIR}/src/helics/shared_api_library/backup/helics/helics.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/java_maps.i
-  )
+        "${SWIG_EXECUTABLE}" "-java" "-package" "com.java.helics" -o "helicsJava.c"
+        "${SWIG_DOXYGEN_FLAG}" "-I${HELICS_SOURCE_DIR}/src/helics/shared_api_library/backup/"
+        "-I${helics.i_INCLUDE_DIR}" ${CMAKE_CURRENT_SOURCE_DIR}/helicsJava.i
+    DEPENDS ${HELICS_SWIG_helics.i_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/helicsJava.i
+            ${HELICS_SOURCE_DIR}/src/helics/shared_api_library/backup/helics/helics.h
+            ${CMAKE_CURRENT_SOURCE_DIR}/java_maps.i
+)
 
-  if(HELICS_OVERWRITE_INTERFACE_FILES)
+if(HELICS_OVERWRITE_INTERFACE_FILES)
     add_custom_target(
-      javafile_overwrite ALL
-      COMMAND
-        ${CMAKE_COMMAND} -D TARGET_DIR=${CMAKE_CURRENT_SOURCE_DIR}/interface -P
-        ${CMAKE_CURRENT_SOURCE_DIR}/overwriteJavaFiles.cmake
-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/helicsJava.c
+        javafile_overwrite ALL
+        COMMAND ${CMAKE_COMMAND} -D TARGET_DIR=${CMAKE_CURRENT_SOURCE_DIR}/interface -P
+                ${CMAKE_CURRENT_SOURCE_DIR}/overwriteJavaFiles.cmake
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/helicsJava.c
     )
     set_target_properties(javafile_overwrite PROPERTIES FOLDER interfaces)
-  else(HELICS_OVERWRITE_INTERFACE_FILES)
-  #extra target for generation only and no overwrite so the dependency actually gets evaluated by cmake
-   add_custom_target(
-      java_create ALL
-      COMMAND
-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/helicsJava.c
-    )
+else(HELICS_OVERWRITE_INTERFACE_FILES)
+    # extra target for generation only and no overwrite so the dependency actually gets evaluated by
+    # cmake
+    add_custom_target(java_create ALL COMMAND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/helicsJava.c)
     set_target_properties(java_create PROPERTIES FOLDER interfaces)
 endif(HELICS_OVERWRITE_INTERFACE_FILES)
diff --git a/interfaces/java/overwriteJavaFiles.cmake b/interfaces/java/overwriteJavaFiles.cmake
index b9ee6eb0eb..f3bfcd64c9 100644
--- a/interfaces/java/overwriteJavaFiles.cmake
+++ b/interfaces/java/overwriteJavaFiles.cmake
@@ -9,8 +9,8 @@
 
 configure_file(helicsJava.c ${TARGET_DIR}/helicsJava.c COPYONLY)
 
- FILE(GLOB JAVA_FILES *.java)
+file(GLOB JAVA_FILES *.java)
 
- FILE(COPY ${JAVA_FILES} DESTINATION ${TARGET_DIR})
+file(COPY ${JAVA_FILES} DESTINATION ${TARGET_DIR})
 
- message(STATUS "overwriting java files in source directory")
+message(STATUS "overwriting java files in source directory")
diff --git a/interfaces/octave/generateOCTcreationScript.cmake b/interfaces/octave/generateOCTcreationScript.cmake
index 46a2417bfb..8faf65987a 100644
--- a/interfaces/octave/generateOCTcreationScript.cmake
+++ b/interfaces/octave/generateOCTcreationScript.cmake
@@ -10,9 +10,9 @@
 get_filename_component(LIBRARY_BUILD_LOCATION ${LIBRARY_FILE} DIRECTORY)
 get_filename_component(LIBRARY_NAME ${LIBRARY_FILE} NAME_WE)
 
-IF (UNIX)
+if(UNIX)
     string(REGEX REPLACE "^lib" "" LIBRARY_NAME ${LIBRARY_NAME})
-ENDIF(UNIX)
+endif(UNIX)
 
 get_filename_component(BUILD_DIR ${BUILD_FILE} DIRECTORY)
 configure_file(${SOURCE_DIR}/mkhelicsOCTFile.m.in ${BUILD_DIR}/mkhelicsOCTFile.m)
diff --git a/interfaces/octave/modifyOctSourceFile.cmake b/interfaces/octave/modifyOctSourceFile.cmake
index 0cd876e306..2fce891a9f 100644
--- a/interfaces/octave/modifyOctSourceFile.cmake
+++ b/interfaces/octave/modifyOctSourceFile.cmake
@@ -9,20 +9,20 @@
 
 # modifyOctSourceFile.cmake
 
-if (WIN32)
+if(WIN32)
     if(helicsOCTAVE_wrap.cxx IS_NEWER_THAN helicsOCTAVE_wrap.cpp)
         if(VOID_SIZE EQUAL 8)
             file(READ helicsOCTAVE_wrap.cxx HELICS_OCT_SOURCE)
 
-string(REPLACE "long swig_this\(\) const"
-       "long long swig_this\(\)" HELICS_OCT_SOURCE
-       "${HELICS_OCT_SOURCE}")
-string(REPLACE "return \(long\) this"
-       "return \(long long\) this" HELICS_OCT_SOURCE
-       "${HELICS_OCT_SOURCE}")
-string(REPLACE "\(long\) types[0].second.ptr"
-       "\(long long\) types[0].second.ptr" HELICS_OCT_SOURCE
-       "${HELICS_OCT_SOURCE}")
+            string(REPLACE "long swig_this\(\) const" "long long swig_this\(\)" HELICS_OCT_SOURCE
+                           "${HELICS_OCT_SOURCE}"
+            )
+            string(REPLACE "return \(long\) this" "return \(long long\) this" HELICS_OCT_SOURCE
+                           "${HELICS_OCT_SOURCE}"
+            )
+            string(REPLACE "\(long\) types[0].second.ptr" "\(long long\) types[0].second.ptr"
+                           HELICS_OCT_SOURCE "${HELICS_OCT_SOURCE}"
+            )
 
             file(WRITE helicsOCTAVE_wrap.cpp "${HELICS_OCT_SOURCE}")
             set(FILE_WRITTEN TRUE)
@@ -30,6 +30,6 @@ string(REPLACE "\(long\) types[0].second.ptr"
     endif()
 endif(WIN32)
 
-if (NOT FILE_WRITTEN)
+if(NOT FILE_WRITTEN)
     configure_file(helicsOCTAVE_wrap.cxx helicsOCTAVE_wrap.cpp COPYONLY)
 endif()
diff --git a/src/helics/CMakeLists.txt b/src/helics/CMakeLists.txt
index ac00d0c827..b35c3ea696 100644
--- a/src/helics/CMakeLists.txt
+++ b/src/helics/CMakeLists.txt
@@ -55,7 +55,9 @@ file(COPY ${CMAKE_CURRENT_BINARY_DIR}/helics_cxx_export.h
 )
 
 if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    set_target_properties(helics_application_api helics_common helics_core PROPERTIES FOLDER helics)
+    set_target_properties(
+        helics_application_api helics_common helics_core helics_network PROPERTIES FOLDER helics
+    )
 endif()
 
 if(HELICS_BUILD_APP_LIBRARY)
@@ -68,4 +70,8 @@ endif(HELICS_BUILD_APP_LIBRARY)
 if(NOT HELICS_DISABLE_C_SHARED_LIB)
     add_subdirectory(shared_api_library)
     add_subdirectory(cpp98)
+
+    if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+        set_target_properties(helics helicsCpp98_ide PROPERTIES FOLDER helics)
+    endif()
 endif()
diff --git a/src/helics/common/CMakeLists.txt b/src/helics/common/CMakeLists.txt
index 1943bf3cee..870db24a09 100644
--- a/src/helics/common/CMakeLists.txt
+++ b/src/helics/common/CMakeLists.txt
@@ -43,14 +43,7 @@ set_target_properties(helics_common PROPERTIES LINKER_LANGUAGE CXX)
 target_link_libraries(
     helics_common PUBLIC helics_base build_flags_target PRIVATE compile_flags_target
 )
-target_link_libraries(helics_common PUBLIC gmlc::utilities units::units)
-
-if(NOT TARGET HELICS::jsoncpp)
-    # link with external jsoncpp library instead of vendored
-    target_link_libraries(helics_common PUBLIC JsonCpp::JsonCpp)
-else()
-    target_link_libraries(helics_common PUBLIC HELICS::jsoncpp)
-endif()
+target_link_libraries(helics_common PUBLIC gmlc::utilities units::units JsonCpp::JsonCpp)
 
 if(TARGET Boost::boost AND NOT HELICS_DISABLE_BOOST)
     target_link_libraries(helics_common PRIVATE Boost::boost)
diff --git a/src/helics/cxx_shared_library/collect_cxx_shared_headers.cmake b/src/helics/cxx_shared_library/collect_cxx_shared_headers.cmake
index a504e727ea..2909ccfb4c 100644
--- a/src/helics/cxx_shared_library/collect_cxx_shared_headers.cmake
+++ b/src/helics/cxx_shared_library/collect_cxx_shared_headers.cmake
@@ -15,15 +15,11 @@ file(COPY ${helics_shared_public_headers}
      DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics/application_api
 )
 
-file(COPY ${conv_headers} ${basic_headers}
-     DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics
-)
+file(COPY ${conv_headers} ${basic_headers} DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics)
 
 file(COPY ${core_include_files} DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics/core)
 
-file(COPY ${utilities_include_files}
-     DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics/utilities
-)
+file(COPY ${utilities_include_files} DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics/utilities)
 
 file(COPY ${HELICS_SOURCE_DIR}/ThirdParty/helics/external
      DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics
@@ -34,10 +30,6 @@ file(COPY ${HELICS_BINARY_DIR}/helics_generated_includes/helics
 )
 
 if(HELICS_BUILD_APP_LIBRARY)
-    file(COPY ${helics_apps_public_headers}
-         DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics/apps
-    )
-    file(COPY ${basic_app_headers}
-         DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics
-    )
+    file(COPY ${helics_apps_public_headers} DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics/apps)
+    file(COPY ${basic_app_headers} DESTINATION ${HELICS_CXX_HEADER_FILE_LOC}/helics)
 endif()
diff --git a/src/helics/cxx_shared_library/cxx_file_list.cmake b/src/helics/cxx_shared_library/cxx_file_list.cmake
index c7060ba13f..34eac9f8de 100644
--- a/src/helics/cxx_shared_library/cxx_file_list.cmake
+++ b/src/helics/cxx_shared_library/cxx_file_list.cmake
@@ -7,8 +7,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-# this file just contains the lists of header files to use for the cxx shared library
-# and app library for public headers
+# this file just contains the lists of header files to use for the cxx shared library and app
+# library for public headers
 set(helics_shared_public_headers
     ${HELICS_LIBRARY_SOURCE_DIR}/application_api/CombinationFederate.hpp
     ${HELICS_LIBRARY_SOURCE_DIR}/application_api/Publications.hpp
@@ -46,8 +46,7 @@ set(helics_shared_private_headers
 set(conv_headers
     ${HELICS_LIBRARY_SOURCE_DIR}/application_api.hpp
     ${HELICS_LIBRARY_SOURCE_DIR}/ValueFederates.hpp
-    ${HELICS_LIBRARY_SOURCE_DIR}/MessageFederates.hpp
-    ${HELICS_LIBRARY_SOURCE_DIR}/helics.hpp
+    ${HELICS_LIBRARY_SOURCE_DIR}/MessageFederates.hpp ${HELICS_LIBRARY_SOURCE_DIR}/helics.hpp
 )
 set(basic_headers ${HELICS_LIBRARY_SOURCE_DIR}/helics_enums.h)
 set(basic_app_headers ${HELICS_LIBRARY_SOURCE_DIR}/helics_apps.hpp)

From e7f02da1198059a64f870fcc9e784eb03fb0a469 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 06:11:03 -0700
Subject: [PATCH 08/16] [pre-commit.ci] pre-commit autoupdate (#2446)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/psf/black: 22.8.0 → 22.10.0](https://github.com/psf/black/compare/22.8.0...22.10.0)
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.0 → v3.0.0-alpha.1](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.0...v3.0.0-alpha.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 970d6f49f8..3c13c703f7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: dockerfile_lint
         args: [--rulefile, ./config/Docker/docker_rules.yml, --dockerfile]
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
         args: ["--line-length=100"]
@@ -40,7 +40,7 @@ repos:
       - id: detect-private-key
         exclude: ^(tests/helics/test_files/encryption_config/openssl_certs/)
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.0
+    rev: v3.0.0-alpha.1
     hooks:
       - id: prettier
         exclude: ^(docs/user-guide/examples/user_guide_examples)

From 0f0194acf738d082ad344c51fe638666c678f9f0 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Fri, 14 Oct 2022 08:02:57 -0700
Subject: [PATCH 09/16] fix some issues with the code coverage  (#2447)

* fix some issues with the code coverage and few other warnings and potential bug fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* use environment variable for setting safe directory for codecov builde

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .github/workflows/code-coverage.yml         |  1 +
 config/cmake/updateGitSubmodules.cmake      |  2 +-
 src/helics/application_api/FederateInfo.cpp |  2 +-
 src/helics/core/CommonCore.cpp              |  3 ++
 src/helics/core/FederateState.cpp           |  1 +
 src/helics/core/InputInfo.cpp               |  5 ++-
 tests/helics/network/ZeromqCore-tests.cpp   | 34 ++++++++++++---------
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index ff7c4ed10c..cb36d3e5a5 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -39,6 +39,7 @@ jobs:
     - name: Build HELICS
       run: |
         unset VCPKG_ROOT
+        git config --global --add safe.directory ${GITHUB_WORKSPACE}
         source scripts/setup-helics-ci-options.sh
         mkdir -p build && cd build
         ../scripts/ci-build.sh
diff --git a/config/cmake/updateGitSubmodules.cmake b/config/cmake/updateGitSubmodules.cmake
index 095ebb1a98..f071dea78b 100644
--- a/config/cmake/updateGitSubmodules.cmake
+++ b/config/cmake/updateGitSubmodules.cmake
@@ -1,5 +1,5 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# Copyright (c) 2017-2020, Battelle Memorial Institute; Lawrence Livermore
+# Copyright (c) 2017-2022, Battelle Memorial Institute; Lawrence Livermore
 # National Security, LLC; Alliance for Sustainable Energy, LLC.
 # See the top-level NOTICE for additional details.
 # All rights reserved.
diff --git a/src/helics/application_api/FederateInfo.cpp b/src/helics/application_api/FederateInfo.cpp
index 983f097155..b89c574fe0 100644
--- a/src/helics/application_api/FederateInfo.cpp
+++ b/src/helics/application_api/FederateInfo.cpp
@@ -62,7 +62,7 @@ FederateInfo::FederateInfo(const std::string& args)
     loadInfoFromArgsIgnoreOutput(args);
 }
 
-static constexpr frozen::unordered_map<std::string_view, int, 67> propStringsTranslations{
+static constexpr frozen::unordered_map<std::string_view, int, 69> propStringsTranslations{
     {"period", HELICS_PROPERTY_TIME_PERIOD},
     {"timeperiod", HELICS_PROPERTY_TIME_PERIOD},
     {"time_period", HELICS_PROPERTY_TIME_PERIOD},
diff --git a/src/helics/core/CommonCore.cpp b/src/helics/core/CommonCore.cpp
index caaad02dce..47c64e5268 100644
--- a/src/helics/core/CommonCore.cpp
+++ b/src/helics/core/CommonCore.cpp
@@ -591,6 +591,9 @@ bool CommonCore::enterInitializingMode(LocalFederateId federateID, IterationRequ
                 // callback federates cannot iterate in startup
                 request = IterationRequest::NO_ITERATIONS;
             }
+            break;
+        default:
+            break;
     }
     switch (fed->getState()) {
         case FederateStates::CREATED:
diff --git a/src/helics/core/FederateState.cpp b/src/helics/core/FederateState.cpp
index 80aa1ea0ca..171d2b8dc8 100644
--- a/src/helics/core/FederateState.cpp
+++ b/src/helics/core/FederateState.cpp
@@ -476,6 +476,7 @@ IterationResult FederateState::enterInitializingMode(IterationRequest request)
                 allowed_send_time = initialTime;
                 break;
             case MessageProcessingResult::ITERATING:
+            default:
                 break;
         }
         return static_cast<IterationResult>(ret);
diff --git a/src/helics/core/InputInfo.cpp b/src/helics/core/InputInfo.cpp
index 7b9b503c12..516940a9de 100644
--- a/src/helics/core/InputInfo.cpp
+++ b/src/helics/core/InputInfo.cpp
@@ -86,6 +86,9 @@ bool InputInfo::addData(GlobalHandle source_id,
                         unsigned int iteration,
                         std::shared_ptr<const SmallBuffer> data)
 {
+    if (!data) {
+        return false;
+    }
     int index;
     bool found = false;
     for (index = 0; index < static_cast<int>(input_sources.size()); ++index) {
@@ -141,7 +144,7 @@ bool InputInfo::addData(GlobalHandle source_id,
                 }
             }
             if (only_update_on_change) {
-                if (*prev->data == *data) {
+                if (*prev->data == *newRecord.data) {
                     return false;
                 }
             }
diff --git a/tests/helics/network/ZeromqCore-tests.cpp b/tests/helics/network/ZeromqCore-tests.cpp
index 3bed0783a3..7864afa27a 100644
--- a/tests/helics/network/ZeromqCore-tests.cpp
+++ b/tests/helics/network/ZeromqCore-tests.cpp
@@ -41,7 +41,8 @@ TEST(ZMQCore, zmqComms_broker)
     comm.loadTargetInfo(host, host);
 
     auto ctx = ZmqContextManager::getContextPointer();
-    zmq::socket_t repSocket(ctx->getContext(), ZMQ_REP);
+    auto& zctx = ctx->getContext();
+    zmq::socket_t repSocket(zctx, ZMQ_REP);
     repSocket.setsockopt(ZMQ_LINGER, 200);
     repSocket.bind(defServer);
 
@@ -73,11 +74,12 @@ TEST(ZMQCore, zmqRequestSet1)
     helics::zeromq::ZmqRequestSets reqset;
 
     auto ctx = ZmqContextManager::getContextPointer();
-    zmq::socket_t repSocket1(ctx->getContext(), ZMQ_REP);
+    auto& zctx = ctx->getContext();
+    zmq::socket_t repSocket1(zctx, ZMQ_REP);
     repSocket1.bind(defServer);
-    zmq::socket_t repSocket2(ctx->getContext(), ZMQ_REP);
+    zmq::socket_t repSocket2(zctx, ZMQ_REP);
     repSocket2.bind(defRoute1);
-    zmq::socket_t repSocket3(ctx->getContext(), ZMQ_REP);
+    zmq::socket_t repSocket3(zctx, ZMQ_REP);
     repSocket3.bind(defRoute2);
 
     reqset.addRoutes(1, defServer);
@@ -138,11 +140,12 @@ TEST(ZMQCore, zmqRequestSet2)
     helics::zeromq::ZmqRequestSets reqset;
 
     auto ctx = ZmqContextManager::getContextPointer();
-    zmq::socket_t repSocket1(ctx->getContext(), ZMQ_REP);
+    auto& zctx = ctx->getContext();
+    zmq::socket_t repSocket1(zctx, ZMQ_REP);
     repSocket1.bind(defServer);
-    zmq::socket_t repSocket2(ctx->getContext(), ZMQ_REP);
+    zmq::socket_t repSocket2(zctx, ZMQ_REP);
     repSocket2.bind(defRoute1);
-    zmq::socket_t repSocket3(ctx->getContext(), ZMQ_REP);
+    zmq::socket_t repSocket3(zctx, ZMQ_REP);
     repSocket3.bind(defRoute2);
 
     repSocket1.setsockopt(ZMQ_LINGER, 100);
@@ -240,7 +243,8 @@ TEST(ZMQCore, zmqComms_broker_test_transmit)
     comm.loadTargetInfo(host, host);
 
     auto ctx = ZmqContextManager::getContextPointer();
-    zmq::socket_t repSocket(ctx->getContext(), ZMQ_REP);
+    auto& zctx = ctx->getContext();
+    zmq::socket_t repSocket(zctx, ZMQ_REP);
     try {
         repSocket.bind(defServer);
     }
@@ -250,7 +254,7 @@ TEST(ZMQCore, zmqComms_broker_test_transmit)
         GTEST_FAIL() << "Unable to bind Socket";
     }
     repSocket.setsockopt(ZMQ_LINGER, 100);
-    zmq::socket_t pullSocket(ctx->getContext(), ZMQ_PULL);
+    zmq::socket_t pullSocket(zctx, ZMQ_PULL);
     try {
         pullSocket.bind(defRoute1);
     }
@@ -292,7 +296,8 @@ TEST(ZMQCore, zmqComms_rx)
     comm.loadTargetInfo(host, host);
 
     auto ctx = ZmqContextManager::getContextPointer();
-    zmq::socket_t repSocket(ctx->getContext(), ZMQ_REP);
+    auto& zctx = ctx->getContext();
+    zmq::socket_t repSocket(zctx, ZMQ_REP);
     try {
         repSocket.bind(defServer);
     }
@@ -302,7 +307,7 @@ TEST(ZMQCore, zmqComms_rx)
         GTEST_FAIL() << "Unable to bind Socket";
     }
     repSocket.setsockopt(ZMQ_LINGER, 100);
-    zmq::socket_t pullSocket(ctx->getContext(), ZMQ_PULL);
+    zmq::socket_t pullSocket(zctx, ZMQ_PULL);
     try {
         pullSocket.bind(defRoute1);
     }
@@ -324,7 +329,7 @@ TEST(ZMQCore, zmqComms_rx)
     bool connected = comm.connect();
     EXPECT_TRUE(connected);
 
-    zmq::socket_t pushSocket(ctx->getContext(), ZMQ_PUSH);
+    zmq::socket_t pushSocket(zctx, ZMQ_PUSH);
     pushSocket.connect("tcp://127.0.0.1:23407");
 
     helics::ActionMessage cmd(helics::CMD_ACK);
@@ -523,7 +528,8 @@ TEST(ZMQCore, zmqCore_initialization)
     ASSERT_TRUE(core != nullptr);
     EXPECT_TRUE(core->isConfigured());
     auto ctx = ZmqContextManager::getContextPointer();
-    zmq::socket_t repSocket(ctx->getContext(), ZMQ_REP);
+    auto& zctx = ctx->getContext();
+    zmq::socket_t repSocket(zctx, ZMQ_REP);
     try {
         repSocket.bind(defServer);
     }
@@ -533,7 +539,7 @@ TEST(ZMQCore, zmqCore_initialization)
         GTEST_FAIL() << "Unable to bind Socket";
     }
     repSocket.setsockopt(ZMQ_LINGER, 100);
-    zmq::socket_t pullSocket(ctx->getContext(), ZMQ_PULL);
+    zmq::socket_t pullSocket(zctx, ZMQ_PULL);
     try {
         pullSocket.bind(defRoute1);
     }

From faecffb832f7cb5e51ad2830612b8cc6bae664e7 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 05:44:12 -0700
Subject: [PATCH 10/16] [pre-commit.ci] pre-commit autoupdate (#2449)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.1 → v3.0.0-alpha.2](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.1...v3.0.0-alpha.2)
- [github.com/codespell-project/codespell: v2.2.1 → v2.2.2](https://github.com/codespell-project/codespell/compare/v2.2.1...v2.2.2)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml                    | 4 ++--
 docs/man/manpage_out/helics_app-recorder.1 | 2 +-
 docs/man/recorder-contents.adoc            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3c13c703f7..78c20150b9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -40,7 +40,7 @@ repos:
       - id: detect-private-key
         exclude: ^(tests/helics/test_files/encryption_config/openssl_certs/)
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.1
+    rev: v3.0.0-alpha.2
     hooks:
       - id: prettier
         exclude: ^(docs/user-guide/examples/user_guide_examples)
@@ -62,7 +62,7 @@ repos:
       - id: cmake-format
         exclude: "cmake_+"
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.1
+    rev: v2.2.2
     hooks:
       - id: codespell
         exclude: ^(docs/user-guide/examples/user_guide_examples)
diff --git a/docs/man/manpage_out/helics_app-recorder.1 b/docs/man/manpage_out/helics_app-recorder.1
index 9f7258dc7c..e84282146d 100644
--- a/docs/man/manpage_out/helics_app-recorder.1
+++ b/docs/man/manpage_out/helics_app-recorder.1
@@ -44,7 +44,7 @@ helics_app-recorder \- records data from a federation
 .fi
 .SH "DESCRIPTION"
 .sp
-The recorder appliation provides an easy way to capture data from a federation\&. It acts as a federate that can "capture" values or messages from publications, direct endpoints, or cloned endpoints that were created by other federates\&.
+The recorder application provides an easy way to capture data from a federation\&. It acts as a federate that can "capture" values or messages from publications, direct endpoints, or cloned endpoints that were created by other federates\&.
 .SH "OPTIONS"
 .PP
 \-\-allow_iteration
diff --git a/docs/man/recorder-contents.adoc b/docs/man/recorder-contents.adoc
index b3c3968105..bad32ee41b 100644
--- a/docs/man/recorder-contents.adoc
+++ b/docs/man/recorder-contents.adoc
@@ -10,7 +10,7 @@
 
 DESCRIPTION
 -----------
-The recorder appliation provides an easy way to capture data from a federation.
+The recorder application provides an easy way to capture data from a federation.
 It acts as a federate that can "capture" values or messages from publications,
 direct endpoints, or cloned endpoints that were created by other federates.
 

From c51ca29bdea3307f22219afdbd512b165bd0ba8b Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Wed, 19 Oct 2022 13:14:31 -0700
Subject: [PATCH 11/16] Iteration counter (#2451)

* add a method to get the iteration counter and remove unused method in the core.

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 src/helics/core/CommonCore.cpp                       | 9 ---------
 src/helics/core/CommonCore.hpp                       | 1 -
 src/helics/core/Core.hpp                             | 4 ----
 src/helics/core/EmptyCore.cpp                        | 5 -----
 src/helics/core/EmptyCore.hpp                        | 1 -
 src/helics/core/FederateState.cpp                    | 2 ++
 src/helics/core/TimeCoordinator.cpp                  | 6 +++---
 src/helics/core/helics_definitions.hpp               | 1 +
 src/helics/helics_enums.h                            | 2 ++
 src/helics/shared_api_library/backup/helics/helics.h | 2 ++
 tests/helics/system_tests/iterationTests.cpp         | 6 ++++--
 11 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/helics/core/CommonCore.cpp b/src/helics/core/CommonCore.cpp
index 47c64e5268..492dd0fb31 100644
--- a/src/helics/core/CommonCore.cpp
+++ b/src/helics/core/CommonCore.cpp
@@ -959,15 +959,6 @@ Time CommonCore::getCurrentTime(LocalFederateId federateID) const
     return fed->grantedTime();
 }
 
-uint64_t CommonCore::getCurrentReiteration(LocalFederateId federateID) const
-{
-    auto* fed = getFederateAt(federateID);
-    if (fed == nullptr) {
-        throw InvalidIdentifier("federateID not valid (getCurrentReiteration)");
-    }
-    return fed->getCurrentIteration();
-}
-
 void CommonCore::setIntegerProperty(LocalFederateId federateID,
                                     int32_t property,
                                     int16_t propertyValue)
diff --git a/src/helics/core/CommonCore.hpp b/src/helics/core/CommonCore.hpp
index 940f0d4ec6..5d004cf1a4 100644
--- a/src/helics/core/CommonCore.hpp
+++ b/src/helics/core/CommonCore.hpp
@@ -116,7 +116,6 @@ class CommonCore: public Core, public BrokerBase {
     virtual void processCommunications(LocalFederateId federateID,
                                        std::chrono::milliseconds msToWait) override final;
     virtual Time getCurrentTime(LocalFederateId federateID) const override final;
-    virtual uint64_t getCurrentReiteration(LocalFederateId federateID) const override final;
     virtual void
         setTimeProperty(LocalFederateId federateID, int32_t property, Time time) override final;
     virtual void setIntegerProperty(LocalFederateId federateID,
diff --git a/src/helics/core/Core.hpp b/src/helics/core/Core.hpp
index 02c8ed8523..16bb93dbed 100644
--- a/src/helics/core/Core.hpp
+++ b/src/helics/core/Core.hpp
@@ -266,10 +266,6 @@ class Core {
     virtual iteration_time
         requestTimeIterative(LocalFederateId federateID, Time next, IterationRequest iterate) = 0;
 
-    /**
-     * Returns the current reiteration count for the specified federate.
-     */
-    virtual uint64_t getCurrentReiteration(LocalFederateId federateID) const = 0;
     /** blocking call that processes helics communication messages
      * this call can be used when expecting communication from other federates or when the federate
      * has nothing else to do and doesn't want to advance time
diff --git a/src/helics/core/EmptyCore.cpp b/src/helics/core/EmptyCore.cpp
index 3d6b3f99be..d421b1266e 100644
--- a/src/helics/core/EmptyCore.cpp
+++ b/src/helics/core/EmptyCore.cpp
@@ -153,11 +153,6 @@ Time EmptyCore::getCurrentTime(LocalFederateId /*federateID*/) const
     return Time::maxVal();
 }
 
-uint64_t EmptyCore::getCurrentReiteration(LocalFederateId /*federateID*/) const
-{
-    return 0U;
-}
-
 void EmptyCore::setIntegerProperty(LocalFederateId /*federateID*/,
                                    int32_t /*property*/,
                                    int16_t /*propertyValue*/)
diff --git a/src/helics/core/EmptyCore.hpp b/src/helics/core/EmptyCore.hpp
index 4cfebe0aa2..4edcdd30be 100644
--- a/src/helics/core/EmptyCore.hpp
+++ b/src/helics/core/EmptyCore.hpp
@@ -55,7 +55,6 @@ class EmptyCore: public Core {
     virtual void processCommunications(LocalFederateId fedId,
                                        std::chrono::milliseconds msToWait) override final;
     virtual Time getCurrentTime(LocalFederateId federateID) const override;
-    virtual uint64_t getCurrentReiteration(LocalFederateId federateID) const override;
     virtual void setTimeProperty(LocalFederateId federateID, int32_t property, Time time) override;
     virtual void setIntegerProperty(LocalFederateId federateID,
                                     int32_t property,
diff --git a/src/helics/core/FederateState.cpp b/src/helics/core/FederateState.cpp
index 171d2b8dc8..305167521b 100644
--- a/src/helics/core/FederateState.cpp
+++ b/src/helics/core/FederateState.cpp
@@ -2154,6 +2154,8 @@ int32_t FederateState::getHandleOption(InterfaceHandle handle, char iType, int32
 int FederateState::getIntegerProperty(int intProperty) const
 {
     switch (intProperty) {
+        case defs::Properties::CURRENT_ITERATION:
+            return timeCoord->getCurrentIteration();
         case defs::Properties::LOG_LEVEL:
         case defs::Properties::FILE_LOG_LEVEL:
         case defs::Properties::CONSOLE_LOG_LEVEL:
diff --git a/src/helics/core/TimeCoordinator.cpp b/src/helics/core/TimeCoordinator.cpp
index 91f93e43e8..fc553a87ac 100644
--- a/src/helics/core/TimeCoordinator.cpp
+++ b/src/helics/core/TimeCoordinator.cpp
@@ -1390,7 +1390,6 @@ void TimeCoordinator::setProperty(int timeProperty, Time propertyVal)
     }
 }
 
-/** set a timeProperty for a the coordinator*/
 void TimeCoordinator::setProperty(int intProperty, int propertyVal)
 {
     if (intProperty == defs::Properties::MAX_ITERATIONS) {
@@ -1420,6 +1419,7 @@ void TimeCoordinator::setOptionFlag(int optionFlag, bool value)
             break;
     }
 }
+
 /** get a time Property*/
 Time TimeCoordinator::getTimeProperty(int timeProperty) const
 {
@@ -1439,18 +1439,18 @@ Time TimeCoordinator::getTimeProperty(int timeProperty) const
     }
 }
 
-/** get a time Property*/
 int TimeCoordinator::getIntegerProperty(int intProperty) const
 {
     switch (intProperty) {  // NOLINT
         case defs::Properties::MAX_ITERATIONS:
             return info.maxIterations;
+        case defs::Properties::CURRENT_ITERATION:
+            return iteration.load();
         default:
             return HELICS_INVALID_PROPERTY_VALUE;
     }
 }
 
-/** get an option flag value*/
 bool TimeCoordinator::getOptionFlag(int optionFlag) const
 {
     switch (optionFlag) {
diff --git a/src/helics/core/helics_definitions.hpp b/src/helics/core/helics_definitions.hpp
index 74f5131b5d..a0c9d28524 100644
--- a/src/helics/core/helics_definitions.hpp
+++ b/src/helics/core/helics_definitions.hpp
@@ -139,6 +139,7 @@ namespace defs {
         GRANT_TIMEOUT = HELICS_PROPERTY_TIME_GRANT_TIMEOUT,
         INPUT_DELAY = HELICS_PROPERTY_TIME_INPUT_DELAY,
         OUTPUT_DELAY = HELICS_PROPERTY_TIME_OUTPUT_DELAY,
+        CURRENT_ITERATION = HELICS_PROPERTY_INT_CURRENT_ITERATION,
         MAX_ITERATIONS = HELICS_PROPERTY_INT_MAX_ITERATIONS,
         LOG_LEVEL = HELICS_PROPERTY_INT_LOG_LEVEL,
         STOPTIME = HELICS_PROPERTY_TIME_STOPTIME,
diff --git a/src/helics/helics_enums.h b/src/helics/helics_enums.h
index 0bf99a8556..8e05b604dc 100644
--- a/src/helics/helics_enums.h
+++ b/src/helics/helics_enums.h
@@ -292,6 +292,8 @@ typedef enum { /* NOLINT */
                /** the property specifying a timeout to trigger actions if the time for granting
                   exceeds a certain threshold*/
                HELICS_PROPERTY_TIME_GRANT_TIMEOUT = 161,
+               /** read only property getting the current iteration count*/
+               HELICS_PROPERTY_INT_CURRENT_ITERATION = 258,
                /** integer property controlling the maximum number of iterations in a federate*/
                HELICS_PROPERTY_INT_MAX_ITERATIONS = 259,
                /** integer property controlling the log level in a federate see \ref
diff --git a/src/helics/shared_api_library/backup/helics/helics.h b/src/helics/shared_api_library/backup/helics/helics.h
index 702da198fc..f519e43a18 100644
--- a/src/helics/shared_api_library/backup/helics/helics.h
+++ b/src/helics/shared_api_library/backup/helics/helics.h
@@ -318,6 +318,8 @@ typedef enum { /* NOLINT */
                /** the property specifying a timeout to trigger actions if the time for granting
                   exceeds a certain threshold*/
                HELICS_PROPERTY_TIME_GRANT_TIMEOUT = 161,
+               /** read only property getting the current iteration count*/
+               HELICS_PROPERTY_INT_CURRENT_ITERATION = 258,
                /** integer property controlling the maximum number of iterations in a federate*/
                HELICS_PROPERTY_INT_MAX_ITERATIONS = 259,
                /** integer property controlling the log level in a federate see \ref
diff --git a/tests/helics/system_tests/iterationTests.cpp b/tests/helics/system_tests/iterationTests.cpp
index 5ba9ccb81c..e2bfd19431 100644
--- a/tests/helics/system_tests/iterationTests.cpp
+++ b/tests/helics/system_tests/iterationTests.cpp
@@ -43,9 +43,9 @@ TEST_F(iteration, execution_iteration)
     EXPECT_TRUE(comp == helics::IterationResult::ITERATING);
     auto val = subid.getValue<double>();
     EXPECT_EQ(val, 27.0);
+    EXPECT_EQ(vFed1->getIntegerProperty(HELICS_PROPERTY_INT_CURRENT_ITERATION), 1);
 
     comp = vFed1->enterExecutingMode(helics::IterationRequest::ITERATE_IF_NEEDED);
-
     EXPECT_TRUE(comp == helics::IterationResult::NEXT_STEP);
 
     auto val2 = subid.getValue<double>();
@@ -308,7 +308,7 @@ TEST_F(iteration, time_iteration)
     EXPECT_EQ(comp.grantedTime, helics::timeZero);
     auto val = subid.getValue<double>();
     EXPECT_EQ(val, 27.0);
-
+    EXPECT_EQ(vFed1->getIntegerProperty(HELICS_PROPERTY_INT_CURRENT_ITERATION), 1);
     comp = vFed1->requestTimeIterative(1.0, helics::IterationRequest::ITERATE_IF_NEEDED);
 
     EXPECT_TRUE(comp.state == helics::IterationResult::NEXT_STEP);
@@ -545,9 +545,11 @@ TEST_F(iteration, iteration_counter)
         if (c1 <= 10) {
             EXPECT_TRUE(res.state == helics::IterationResult::ITERATING);
             EXPECT_EQ(res.grantedTime, 0.0);
+            EXPECT_EQ(vFed1->getIntegerProperty(HELICS_PROPERTY_INT_CURRENT_ITERATION), c1);
         } else {
             EXPECT_TRUE(res.state == helics::IterationResult::NEXT_STEP);
             EXPECT_EQ(res.grantedTime, 1.0);
+            EXPECT_EQ(vFed1->getIntegerProperty(HELICS_PROPERTY_INT_CURRENT_ITERATION), 0);
         }
     }
     deadlock.join();

From fa59a5caf37906aaeb4cd34c6c693d1a50a61bd6 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Wed, 19 Oct 2022 17:59:09 -0700
Subject: [PATCH 12/16] Allow broker based time barriers to work  (#2452)

* Allow broker based time barriers to work even when setup prior to registration of federates.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 src/helics/core/CoreBroker.cpp             |  8 +++++
 src/helics/core/CoreBroker.hpp             |  1 +
 tests/helics/system_tests/TimingTests2.cpp | 35 ++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/src/helics/core/CoreBroker.cpp b/src/helics/core/CoreBroker.cpp
index e5acd9f18a..c625beda12 100644
--- a/src/helics/core/CoreBroker.cpp
+++ b/src/helics/core/CoreBroker.cpp
@@ -573,6 +573,12 @@ void CoreBroker::fedRegistration(ActionMessage&& command)
             setActionFlag(fedEnableProfiling, indicator_flag);
             transmit(route_id, fedEnableProfiling);
         }
+        if (mNextTimeBarrier < Time::maxVal()) {
+            ActionMessage timeBarrier(CMD_TIME_BARRIER, global_broker_id_local, global_fedid);
+            timeBarrier.actionTime = mNextTimeBarrier;
+            timeBarrier.messageID = global_broker_id_local.baseValue();
+            transmit(route_id, timeBarrier);
+        }
     }
 }
 
@@ -787,6 +793,7 @@ void CoreBroker::generateTimeBarrier(ActionMessage& m)
         if (cancelBarrier.messageID == 0) {
             cancelBarrier.messageID = global_broker_id_local.baseValue();
         }
+        mNextTimeBarrier = Time::maxVal();
         broadcast(cancelBarrier);
         return;
     }
@@ -795,6 +802,7 @@ void CoreBroker::generateTimeBarrier(ActionMessage& m)
     if (m.messageID == 0) {
         m.messageID = global_broker_id_local.baseValue();
     }
+    mNextTimeBarrier = m.actionTime;
     // time should already be set
     broadcast(m);
 }
diff --git a/src/helics/core/CoreBroker.hpp b/src/helics/core/CoreBroker.hpp
index 24340d0b6b..9cfaa944bc 100644
--- a/src/helics/core/CoreBroker.hpp
+++ b/src/helics/core/CoreBroker.hpp
@@ -151,6 +151,7 @@ class CoreBroker: public Broker, public BrokerBase {
     Time mTimeMonitorLastLogTime{Time::minVal()};  //!< the time of the last timing log message
     Time mTimeMonitorCurrentTime{Time::minVal()};  //!< the last time from the timing federate
     std::atomic<double> simTime{mInvalidSimulationTime};  //!< loaded simTime for logging
+    Time mNextTimeBarrier{Time::maxVal()};  //!< the last known time barrier
   private:
     /** function that processes all the messages
     @param command -- the message to process
diff --git a/tests/helics/system_tests/TimingTests2.cpp b/tests/helics/system_tests/TimingTests2.cpp
index 96e6e4369b..738d4f681f 100644
--- a/tests/helics/system_tests/TimingTests2.cpp
+++ b/tests/helics/system_tests/TimingTests2.cpp
@@ -713,6 +713,41 @@ TEST_F(timing2, time_barrier1)
     vFed2->finalize();
 }
 
+// Tests that the time barrier is working even when set before federate registration
+TEST_F(timing2, time_barrier_pre_reg)
+{
+    auto broker = AddBroker("test", 2);
+
+    AddFederates<helics::ValueFederate>("test", 1, broker, helics::Time::epsilon(), "fed");
+    broker->setTimeBarrier(2.0);
+    broker->query("root", "flush");
+    AddFederates<helics::ValueFederate>("test", 1, broker, helics::Time::epsilon(), "fed");
+
+    auto vFed1 = GetFederateAs<helics::ValueFederate>(0);
+
+    auto vFed2 = GetFederateAs<helics::ValueFederate>(1);
+
+    vFed1->enterExecutingModeAsync();
+    vFed2->enterExecutingMode();
+    vFed1->enterExecutingModeComplete();
+    vFed1->requestTimeAsync(3.0);
+    auto rtime = vFed2->requestTime(1.89);
+    EXPECT_EQ(rtime, 1.89);
+
+    vFed2->requestTimeAsync(2.5);
+    std::this_thread::sleep_for(std::chrono::milliseconds(200));
+    EXPECT_FALSE(vFed1->isAsyncOperationCompleted());
+    EXPECT_FALSE(vFed2->isAsyncOperationCompleted());
+
+    brokers[0]->clearTimeBarrier();
+    rtime = vFed2->requestTimeComplete();
+    EXPECT_EQ(rtime, 2.5);
+    rtime = vFed1->requestTimeComplete();
+    EXPECT_EQ(rtime, 3.0);
+    vFed1->finalize();
+    vFed2->finalize();
+}
+
 TEST_F(timing2, time_barrier_update)
 {
     SetupTest<helics::ValueFederate>("test_2", 2);

From 9b340a2d699ea5122371781d3ec2b32a8c961258 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Wed, 19 Oct 2022 20:33:07 -0700
Subject: [PATCH 13/16] defaults  (#2448)

* Allow specification of default values for inputs in the json and toml configurations

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Minor edits to Config. Options Reference for new `defaults` parameters

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update docs/references/configuration_options_reference.md

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

* Update docs/references/configuration_options_reference.md

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

* Update docs/user-guide/fundamental_topics/interface_configuration.md

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

* Update docs/user-guide/fundamental_topics/interface_configuration.md

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

* Corrected `helicsInputSetDefaultTime()` and `helicsInputSetDefaultNamedPoint()` in Config. Options Reference

* Apply suggestions from code review

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Trevor Hardy <trevor.hardy@pnnl.gov>
Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>
---
 .../configuration_options_reference.md        | 30 ++++++++++++++++
 .../interface_configuration.md                | 34 +++++++++++++++++--
 src/helics/application_api/ValueFederate.cpp  | 19 +++++++++--
 .../ValueFederateAdditionalTests.cpp          | 13 +++++++
 .../test_files/example_value_fed_testb.json   |  4 ++-
 .../test_files/example_value_fed_testb.toml   |  4 +--
 6 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/docs/references/configuration_options_reference.md b/docs/references/configuration_options_reference.md
index 613a3ecc4a..8d2b5eb6d2 100644
--- a/docs/references/configuration_options_reference.md
+++ b/docs/references/configuration_options_reference.md
@@ -160,6 +160,7 @@ An example of one publication, subscription, named input, endpoint, and filter i
   "subscriptions": [
     {
       "only_update_on_change": false,
+      "default": value,
     }
   ],
   "inputs": [
@@ -171,6 +172,7 @@ An example of one publication, subscription, named input, endpoint, and filter i
       "multiple_connections_allowed": false
       "multi_input_handling_method": "average",
       "targets": ["pub1", "pub2"]
+      "default": 5.5,
     }
   ],
   "endpoints": [
@@ -761,6 +763,34 @@ This option allows the specific numerical definition of "change" when using the
 
 ---
 
+### `default`
+
+_API:_ `helicsInputSetDefaultX`
+[C++ input](https://docs.helics.org/en/latest/doxygen/classhelics_1_1Input.html#a55056ac9dd2895270f575827dd9951c7)
+| [C input](api-reference/C_API.md#input)
+| [Python input](https://python.helics.org/api/capi-py.html#helicsInputSetDefault)
+| [Julia input](https://julia.helics.org/latest/api/#HELICS.helicsInputSetDefulat-Tuple{HELICS.Input,XXX})
+
+This option allows specifying the default value used when no publication has been received. Each datatype has its own API call such as:
+
+- `helicsInputSetDefaultBoolean()`
+- `helicsInputSetDefaultBytes()`
+- `helicsInputSetDefaultChar()`
+- `helicsInputSetDefaultComplex()`
+- `helicsInputSetDefaultComplexVector()`
+- `helicsInputSetDefaulDouble()`
+- `helicsInputSetDefaultInteger()`
+- `helicsInputSetDefaultRaw()`
+- `helicsInputSetDefaultString()` (used for JSONs)
+- `helicsInputSetDefaultVector()`
+
+Though they are not as obviously named, the following two APIs do provide a means of setting the default value as well:
+
+- `helicsInputSetDefaultTime()` - set the default using a HelicsTime value
+- `helicsInputSetDefaultNamedPoint()` -set the default NamedPoint which is a pair of a string and double used for tagged values or set points
+
+---
+
 ### `connection_required` | `connectionrequired` | `connectionRequired` [false]
 
 _API:_ `helicsFederateInfoSetFlagOption`
diff --git a/docs/user-guide/fundamental_topics/interface_configuration.md b/docs/user-guide/fundamental_topics/interface_configuration.md
index bd79431bfe..93a87f6903 100644
--- a/docs/user-guide/fundamental_topics/interface_configuration.md
+++ b/docs/user-guide/fundamental_topics/interface_configuration.md
@@ -66,9 +66,25 @@ Below is a sample JSON configuration file with some of the more common options.
       "unit":"A",
       "global": true,
       "only_update_on_change": true,
-      "tolerance": 0.2
+      "tolerance": 0.2,
+      "default":0.91
     }
-  ]
+  ],
+  "inputs": [
+    {
+      "key": "ipt2",
+      "type": "double",
+      "connection_required": true,
+      "target": "pub1",
+      "global": true,
+      "default":"3.67",
+      "tags": [
+        { "name": "period", "value": "0.7" },
+        { "name": "description", "value": "a test input" }
+      ]
+    }
+    //specify an input with a target multiple targets could be specified like "targets":["pub1","pub2","pub3"]
+  ],
 }
 ```
 
@@ -93,15 +109,29 @@ Below is a sample JSON configuration file with some of the more common options.
   - `type` - Data type, such as integer, double, complex.
   - `units` - The units can be any sort of unit string, a wide assortment is supported and can be compound units such as m/s^2 and the conversion will convert as long as things are convertible. The unit match is also checked for other types and an error if mismatching units are detected. A warning is also generated if the units are not understood and not matching. The unit checking and conversion is only active if both the publication and subscription specify units. HELICS is able to do some levels of unit conversion, currently only on double type publications but more may be added in the future.
   - `only_transmit_on_change` and `tolerance` - Publications will only send a new value out to the federation when the value has changed more than the delta specified by `tolerance`.
+  - `alias` - an alternate name for the publication must be globally unique for publications
   - `tags` - Arbitrary string value pairs that can be applied to interfaces. Tags are available to others through queries but are not transmitted by default. They can be used to store additional information about an interface that might be useful to applications. At some point in the future automated connection routines will make use of them. "tags" are applicable to any interface and can also be used on federates.
 - **`subscriptions`** - These are lists of the values being sent to and from the given federate.
+
   - `key` - This string identifies the federation-unique value that this federate wishes to receive. If `global` has been set to `false` in the `publications` JSON configuration file, the name of the value is formatted as `<federate name>/<publication key>`. Both of these strings can be found in the publishing federate's JSON configuration file as the `name` and `key` strings, respectively. If `global` is `true` the string is the publishing federate's `key` value.
   - `required` - The message being subscribed to must be provided by some other publisher in the federation.
   - `type` - Data type, such as integer, double, complex.
   - `units` - Same as with `publications`.
   - `global` - Applies to the `key`, same as with `publications`.
+  - `default` - set the default value to return if no publications have been received
   - `only_update_on_change` and `tolerance` - Subscriptions will only consider a new value received when that value has changed more than the delta specified by `tolerance`.
 
+- **`inputs`** - These are lists of the values being sent to and from the given federate.
+  - `name` - the name of the input.
+  - `required` - The input must have a valid target
+  - `type` - Data type, such as integer, double, complex.
+  - `units` - Same as with `publications`.
+  - `global` - Applies to the `key`, same as with `publications`.
+  - `default` - set the default value to return if no publications have been received
+  - `target` - A key for a publication the input should receive, may be an array such as ["pub1","pub2","pub3"]
+  - `tags` - name and value pairs defining user tags for the interface
+  - `only_update_on_change` and `tolerance` - Inputs will only consider a new value received when that value has changed more than the delta specified by `tolerance`.
+
 ## API Configuration
 
 Configuring the federate interface with the API is done internal to a user-written simulator. The specific API used will depend on the language the simulator is written in. Native APIs for HELICS are available in [C++](../../doxygen/index.md) and [C](../../references/api-reference/C_API.md). MATLAB, Java, Julia, Nim, and Python all support the C API calls (ex: `helicsFederateEnterExecutionMode()`). Python and Julia also have native APIs (see: [Python (PyHELICS)](https://python.helics.org/api/), [Julia](https://gmlc-tdc.github.io/HELICS.jl/latest/api/)) that wrap the C APIs to better support the conventions of their languages. The [API References](../../references/api-reference/index.md) page contains links to the APIs.
diff --git a/src/helics/application_api/ValueFederate.cpp b/src/helics/application_api/ValueFederate.cpp
index 1292a069d4..496e3bf3f8 100644
--- a/src/helics/application_api/ValueFederate.cpp
+++ b/src/helics/application_api/ValueFederate.cpp
@@ -292,6 +292,10 @@ void ValueFederate::registerValueInterfacesJson(const std::string& jsonString)
                     subAct->addTarget(name);
                 }
             }
+            auto defStr = fileops::getOrDefault(sub, "default", emptyStr);
+            if (!defStr.empty()) {
+                subAct->setDefault(defStr);
+            }
             loadOptions(this, sub, *subAct);
         }
     }
@@ -312,7 +316,10 @@ void ValueFederate::registerValueInterfacesJson(const std::string& jsonString)
                     inp = &registerInput(name, type, units);
                 }
             }
-
+            auto defStr = fileops::getOrDefault(ipt, "default", emptyStr);
+            if (!defStr.empty()) {
+                inp->setDefault(defStr);
+            }
             loadOptions(this, ipt, *inp);
         }
     }
@@ -386,7 +393,10 @@ void ValueFederate::registerValueInterfacesToml(const std::string& tomlString)
                     id->addTarget(name);
                 }
             }
-
+            auto defStr = fileops::getOrDefault(sub, "default", emptyStr);
+            if (!defStr.empty()) {
+                id->setDefault(defStr);
+            }
             loadOptions(this, sub, *id);
         }
     }
@@ -412,7 +422,10 @@ void ValueFederate::registerValueInterfacesToml(const std::string& tomlString)
                     id = &registerInput(name, type, units);
                 }
             }
-
+            auto defStr = fileops::getOrDefault(ipt, "default", emptyStr);
+            if (!defStr.empty()) {
+                id->setDefault(defStr);
+            }
             loadOptions(this, ipt, *id);
         }
     }
diff --git a/tests/helics/application_api/ValueFederateAdditionalTests.cpp b/tests/helics/application_api/ValueFederateAdditionalTests.cpp
index 2fa225297d..742b5cb9e5 100644
--- a/tests/helics/application_api/ValueFederateAdditionalTests.cpp
+++ b/tests/helics/application_api/ValueFederateAdditionalTests.cpp
@@ -632,6 +632,14 @@ TEST(valuefed_json_tests, file_loadb)
 
     EXPECT_EQ(vFed.getTag("description"), "fedb description");
     EXPECT_EQ(vFed.getTag("version"), "27");
+
+    auto& sub1 = vFed.getInput(0);
+    vFed.enterInitializingMode();
+
+    auto dv = sub1.getDouble();
+    EXPECT_DOUBLE_EQ(dv, 9.33);
+    dv = inp2.getDouble();
+    EXPECT_DOUBLE_EQ(dv, 3.67);
     vFed.disconnect();
     helics::BrokerFactory::terminateAllBrokers();
     helics::CoreFactory::terminateAllCores();
@@ -662,8 +670,13 @@ TEST(valuefederate, toml_file_loadb)
         EXPECT_EQ(std::stod(dval), 0.7);
     }
 
+    auto& sub1 = vFed.getInput(0);
     vFed.enterExecutingMode();
 
+    auto dv = sub1.getDouble();
+    EXPECT_DOUBLE_EQ(dv, 9.33);
+    dv = inp2.getDouble();
+    EXPECT_DOUBLE_EQ(dv, 3.67);
     EXPECT_EQ(vFed.getTag("description"), "fedb description");
     EXPECT_EQ(vFed.getTag("version"), "27");
 
diff --git a/tests/helics/test_files/example_value_fed_testb.json b/tests/helics/test_files/example_value_fed_testb.json
index bab791326c..3725d8d4b9 100644
--- a/tests/helics/test_files/example_value_fed_testb.json
+++ b/tests/helics/test_files/example_value_fed_testb.json
@@ -46,7 +46,8 @@
     {
       "key": "pub1", // the key of the publication
       "connection_required": true, //set to true to make helics issue a warning if the publication is not found
-      "tolerance": 0.3
+      "tolerance": 0.3,
+      "default": "9.33"
     },
     {
       "key": "fedName/pub2", // the name of the publication to subscribe to
@@ -63,6 +64,7 @@
       "connection_required": true,
       "target": "pub1",
       "global": true,
+      "default": 3.67,
       "tags": [
         { "name": "period", "value": "0.7" },
         { "name": "description", "value": "a test input" }
diff --git a/tests/helics/test_files/example_value_fed_testb.toml b/tests/helics/test_files/example_value_fed_testb.toml
index 080ddb6c3f..f6f65218b0 100644
--- a/tests/helics/test_files/example_value_fed_testb.toml
+++ b/tests/helics/test_files/example_value_fed_testb.toml
@@ -12,13 +12,13 @@ period=  1.0 #the period with which federate may return time
 #set required to true to make helics issue a warning if the publication is not found
 #example of inline tables (be careful it falls under the most recent [section] or [[table]]
 subscriptions=[
-{key="pub1",  connection_required=true},
+{key="pub1",  connection_required=true, default=9.33},
   # shortcut is a naming shortcut for the publication for later retrieval
 {key="valueFed_toml/pub2", alias="pubshortcut", info="this is an information string for use by the application"}
 ]
 
 inputs=[
-{key="ipt2",  type="double",flags="connection_optional", target="pub1", global=true,tags=[{name="period",value=0.7},{name="description",value="a test input"}]}
+{key="ipt2",  type="double",flags="connection_optional", target="pub1",default="3.67", global=true,tags=[{name="period",value=0.7},{name="description",value="a test input"}]}
 ]  #specify an input with a target
 
 #add some descriptive tags to a federate

From 7a300fba34da7b930cd81005c45fbcd5daac9842 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Fri, 21 Oct 2022 11:02:39 -0700
Subject: [PATCH 14/16] C api aliases (#2454)

* add C api for addAlias

* add test cases for C alias methods

* add alias operations to C++98 API

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>
---
 src/helics/application_api/Federate.hpp       |  5 +-
 src/helics/cpp98/Broker.hpp                   |  8 ++
 src/helics/cpp98/Core.hpp                     |  9 ++
 src/helics/cpp98/Federate.hpp                 |  9 ++
 .../shared_api_library/FederateExport.cpp     | 27 ++++++
 .../shared_api_library/backup/helics/helics.h | 45 ++++++++--
 .../backup/helics/helics_api.h                |  3 +
 src/helics/shared_api_library/helicsCore.h    | 33 ++++++++
 .../shared_api_library/helicsExport.cpp       | 51 ++++++++++++
 .../shared_library/test-value-federate2.cpp   | 83 +++++++++++++++++++
 10 files changed, 266 insertions(+), 7 deletions(-)

diff --git a/src/helics/application_api/Federate.hpp b/src/helics/application_api/Federate.hpp
index 0e7fd3813a..9f0222c5ed 100644
--- a/src/helics/application_api/Federate.hpp
+++ b/src/helics/application_api/Federate.hpp
@@ -518,7 +518,10 @@ class HELICS_CXX_EXPORT Federate {
     @param value the value of the global
     */
     void setGlobal(std::string_view valueName, std::string_view value);
-    /** add a global alias for an interface */
+    /** add a global alias for an interface
+    @param interfaceName the given name of the interface
+    @param alias the new name by which the interface can be referenced
+    */
     void addAlias(std::string_view interfaceName, std::string_view alias);
     /** send a command to another core or federate
   @param target  the target of the command can be "federation", "federate", "broker", "core", or a
diff --git a/src/helics/cpp98/Broker.hpp b/src/helics/cpp98/Broker.hpp
index 6efee49278..b9dac8f9cf 100644
--- a/src/helics/cpp98/Broker.hpp
+++ b/src/helics/cpp98/Broker.hpp
@@ -126,6 +126,14 @@ class Broker {
     {
         helicsBrokerSetGlobal(broker, valueName.c_str(), value.c_str(), hThrowOnError());
     }
+    /** add a global alias for an interface
+    @param interfaceName the given name of the interface
+    @param alias the new name by which the interface can be referenced
+    */
+    void addAlias(const std::string& interfaceName, const std::string& alias)
+    {
+        helicsBrokerAddAlias(broker, interfaceName.c_str(), alias.c_str(), hThrowOnError());
+    }
     /** create a data link between a named publication and a named input
      @param source the name of the publication
      @param target the name of the input*/
diff --git a/src/helics/cpp98/Core.hpp b/src/helics/cpp98/Core.hpp
index 42985ac963..9ca7084907 100644
--- a/src/helics/cpp98/Core.hpp
+++ b/src/helics/cpp98/Core.hpp
@@ -131,6 +131,15 @@ class Core {
         helicsCoreSetGlobal(core, valueName.c_str(), value.c_str(), hThrowOnError());
     }
 
+    /** add a global alias for an interface
+    @param interfaceName the given name of the interface
+    @param alias the new name by which the interface can be referenced
+    */
+    void addAlias(const std::string& interfaceName, const std::string& alias)
+    {
+        helicsCoreAddAlias(core, interfaceName.c_str(), alias.c_str(), hThrowOnError());
+    }
+
     void globalError(int errorCode, const std::string& errorString)
     {
         helicsCoreGlobalError(core, errorCode, errorString.c_str(), HELICS_IGNORE_ERROR);
diff --git a/src/helics/cpp98/Federate.hpp b/src/helics/cpp98/Federate.hpp
index b9ccf05380..307a0ab4c1 100644
--- a/src/helics/cpp98/Federate.hpp
+++ b/src/helics/cpp98/Federate.hpp
@@ -865,6 +865,15 @@ class Federate {
         helicsFederateSetGlobal(fed, valueName.c_str(), value.c_str(), hThrowOnError());
     }
 
+    /** add a global alias for an interface
+    @param interfaceName the given name of the interface
+    @param alias the new name by which the interface can be referenced
+    */
+    void addAlias(const std::string& interfaceName, const std::string& alias)
+    {
+        helicsFederateAddAlias(fed, interfaceName.c_str(), alias.c_str(), hThrowOnError());
+    }
+
     /** set a tag (key-value pair) for a federate
     @details the tag is an arbitrary user defined string and value; the tags for a federate are
     queryable through a "tags" query or "tag/<tagname>"
diff --git a/src/helics/shared_api_library/FederateExport.cpp b/src/helics/shared_api_library/FederateExport.cpp
index b1748f9307..773e4280fa 100644
--- a/src/helics/shared_api_library/FederateExport.cpp
+++ b/src/helics/shared_api_library/FederateExport.cpp
@@ -1646,6 +1646,33 @@ void helicsFederateSetGlobal(HelicsFederate fed, const char* valueName, const ch
     // LCOV_EXCL_STOP
 }
 
+static constexpr char invalidInterfaceName[] = "Interface name cannot be empty";
+static constexpr char invalidAliasName[] = "Alias cannot be empty";
+
+void helicsFederateAddAlias(HelicsFederate fed, const char* interfaceName, const char* alias, HelicsError* err)
+{
+    auto* fedObj = getFed(fed, err);
+    if (fedObj == nullptr) {
+        return;
+    }
+    if (interfaceName == nullptr || strlen(interfaceName) == 0) {
+        assignError(err, HELICS_ERROR_INVALID_ARGUMENT, invalidInterfaceName);
+        return;
+    }
+    if (alias == nullptr || strlen(alias) == 0) {
+        assignError(err, HELICS_ERROR_INVALID_ARGUMENT, invalidAliasName);
+        return;
+    }
+    try {
+        fedObj->addAlias(interfaceName, alias);
+    }
+    // LCOV_EXCL_START
+    catch (...) {
+        helicsErrorHandler(err);
+    }
+    // LCOV_EXCL_STOP
+}
+
 static constexpr char invalidTagString[] = "Tag name cannot be null";
 void helicsFederateSetTag(HelicsFederate fed, const char* tagName, const char* value, HelicsError* err)
 {
diff --git a/src/helics/shared_api_library/backup/helics/helics.h b/src/helics/shared_api_library/backup/helics/helics.h
index f519e43a18..61b6669510 100644
--- a/src/helics/shared_api_library/backup/helics/helics.h
+++ b/src/helics/shared_api_library/backup/helics/helics.h
@@ -1733,10 +1733,10 @@ HELICS_EXPORT void helicsFederateEnterInitializingModeAsync(HelicsFederate fed,
 HELICS_EXPORT void helicsFederateEnterInitializingModeComplete(HelicsFederate fed, HelicsError* err);
 
 /**
- * Trigger a blocking call and return to created state after all federates have either triggered an iteration or waiting to enter
- * initializing mode
+ * Trigger a blocking call and return to created state after all federates have either triggered an iteration or are waiting to enter
+ * initializing mode.
  *
- * @details this call will return the federate to the created state to allow additional setup to occur with federates either iterating in
+ * @details This call will return the federate to the created state to allow additional setup to occur with federates either iterating in
  * the mode or waiting.
  *
  * @param fed The federate to operate on.
@@ -1757,10 +1757,10 @@ HELICS_EXPORT void helicsFederateEnterInitializingModeIterative(HelicsFederate f
 HELICS_EXPORT void helicsFederateEnterInitializingModeIterativeAsync(HelicsFederate fed, HelicsError* err);
 
 /**
- * Complete the call to initialize mode that was initiated with /ref heliceEnterInitializingModeIterativeAsync.  The federate will be in
- * startup or error mode on return
+ * Complete the call to enter initializing mode Iterative that was initiated with /ref heliceEnterInitializingModeIterativeAsync.  The
+ * federate will be in created or error mode on return
  *
- * @param fed The federate desiring to iterate to the startup mode again
+ * @param fed The federate used in the corresponding async call
  *
  * @param[in,out] err An error object that will contain an error code and string if any error occurred during the execution of the function.
  */
@@ -2097,6 +2097,17 @@ HELICS_EXPORT int helicsFederateGetIntegerProperty(HelicsFederate fed, int intPr
  */
 HELICS_EXPORT HelicsTime helicsFederateGetCurrentTime(HelicsFederate fed, HelicsError* err);
 
+/**
+ * create an alias for an interface
+ *
+ * @param fed The federate to use to set the alias
+ * @param interfaceName The current name of an interface
+ * @param alias the additional name to use for the given interface
+ *
+ * @param[in,out] err A pointer to an error object for catching errors.
+ */
+HELICS_EXPORT void helicsFederateAddAlias(HelicsFederate fed, const char* interfaceName, const char* alias, HelicsError* err);
+
 /**
  * Set a federation global value through a federate.
  *
@@ -2271,6 +2282,28 @@ HELICS_EXPORT void helicsCoreSetGlobal(HelicsCore core, const char* valueName, c
  */
 HELICS_EXPORT void helicsBrokerSetGlobal(HelicsBroker broker, const char* valueName, const char* value, HelicsError* err);
 
+/**
+ * create an alias for an interface
+ *
+ * @param core The core to use to set the alias
+ * @param interfaceName The current name of an interface
+ * @param alias the additional name to use for the given interface
+ *
+ * @param[in,out] err A pointer to an error object for catching errors.
+ */
+HELICS_EXPORT void helicsCoreAddAlias(HelicsCore core, const char* interfaceName, const char* alias, HelicsError* err);
+
+/**
+ * create an alias for an interface
+ *
+ * @param broker The broker to use to set the alias
+ * @param interfaceName The current name of an interface
+ * @param alias the additional name to use for the given interface
+ *
+ * @param[in,out] err A pointer to an error object for catching errors.
+ */
+HELICS_EXPORT void helicsBrokerAddAlias(HelicsBroker broker, const char* interfaceName, const char* alias, HelicsError* err);
+
 /**
  * Send a command to another helics object though a core using asynchronous(fast) operations.
  *
diff --git a/src/helics/shared_api_library/backup/helics/helics_api.h b/src/helics/shared_api_library/backup/helics/helics_api.h
index 563ae7a6df..f47107200a 100644
--- a/src/helics/shared_api_library/backup/helics/helics_api.h
+++ b/src/helics/shared_api_library/backup/helics/helics_api.h
@@ -459,6 +459,7 @@ HelicsTime helicsFederateGetTimeProperty(HelicsFederate fed, int timeProperty, H
 HelicsBool helicsFederateGetFlagOption(HelicsFederate fed, int flag, HelicsError* err);
 int helicsFederateGetIntegerProperty(HelicsFederate fed, int intProperty, HelicsError* err);
 HelicsTime helicsFederateGetCurrentTime(HelicsFederate fed, HelicsError* err);
+void helicsFederateAddAlias(HelicsFederate fed, const char* interfaceName, const char* alias, HelicsError* err);
 void helicsFederateSetGlobal(HelicsFederate fed, const char* valueName, const char* value, HelicsError* err);
 void helicsFederateSetTag(HelicsFederate fed, const char* tagName, const char* value, HelicsError* err);
 const char* helicsFederateGetTag(HelicsFederate fed, const char* tagName, HelicsError* err);
@@ -475,6 +476,8 @@ const char* helicsFederateGetCommandSource(HelicsFederate fed, HelicsError* err)
 const char* helicsFederateWaitCommand(HelicsFederate fed, HelicsError* err);
 void helicsCoreSetGlobal(HelicsCore core, const char* valueName, const char* value, HelicsError* err);
 void helicsBrokerSetGlobal(HelicsBroker broker, const char* valueName, const char* value, HelicsError* err);
+void helicsCoreAddAlias(HelicsCore core, const char* interfaceName, const char* alias, HelicsError* err);
+void helicsBrokerAddAlias(HelicsBroker broker, const char* interfaceName, const char* alias, HelicsError* err);
 void helicsCoreSendCommand(HelicsCore core, const char* target, const char* command, HelicsError* err);
 void helicsCoreSendOrderedCommand(HelicsCore core, const char* target, const char* command, HelicsError* err);
 void helicsBrokerSendCommand(HelicsBroker broker, const char* target, const char* command, HelicsError* err);
diff --git a/src/helics/shared_api_library/helicsCore.h b/src/helics/shared_api_library/helicsCore.h
index 02317f3672..10d303d4b8 100644
--- a/src/helics/shared_api_library/helicsCore.h
+++ b/src/helics/shared_api_library/helicsCore.h
@@ -1380,6 +1380,17 @@ HELICS_EXPORT int helicsFederateGetIntegerProperty(HelicsFederate fed, int intPr
  */
 HELICS_EXPORT HelicsTime helicsFederateGetCurrentTime(HelicsFederate fed, HelicsError* err);
 
+/**
+ * Create an alias for an interface.
+ *
+ * @param fed The federate to use to set the alias.
+ * @param interfaceName The current name of an interface.
+ * @param alias The additional name to use for the given interface.
+ *
+ * @param[in,out] err A pointer to an error object for catching errors.
+ */
+HELICS_EXPORT void helicsFederateAddAlias(HelicsFederate fed, const char* interfaceName, const char* alias, HelicsError* err);
+
 /**
  * Set a federation global value through a federate.
  *
@@ -1554,6 +1565,28 @@ HELICS_EXPORT void helicsCoreSetGlobal(HelicsCore core, const char* valueName, c
  */
 HELICS_EXPORT void helicsBrokerSetGlobal(HelicsBroker broker, const char* valueName, const char* value, HelicsError* err);
 
+/**
+ * Create an alias for an interface.
+ *
+ * @param core The core to use to set the alias.
+ * @param interfaceName The current name of an interface.
+ * @param alias The additional name to use for the given interface.
+ *
+ * @param[in,out] err A pointer to an error object for catching errors.
+ */
+HELICS_EXPORT void helicsCoreAddAlias(HelicsCore core, const char* interfaceName, const char* alias, HelicsError* err);
+
+/**
+ * Create an alias for an interface.
+ *
+ * @param broker The broker to use to set the alias.
+ * @param interfaceName The current name of an interface.
+ * @param alias The additional name to use for the given interface.
+ *
+ * @param[in,out] err A pointer to an error object for catching errors.
+ */
+HELICS_EXPORT void helicsBrokerAddAlias(HelicsBroker broker, const char* interfaceName, const char* alias, HelicsError* err);
+
 /**
  * Send a command to another helics object though a core using asynchronous(fast) operations.
  *
diff --git a/src/helics/shared_api_library/helicsExport.cpp b/src/helics/shared_api_library/helicsExport.cpp
index 9a157cee4a..099f4f5619 100644
--- a/src/helics/shared_api_library/helicsExport.cpp
+++ b/src/helics/shared_api_library/helicsExport.cpp
@@ -588,6 +588,57 @@ void helicsBrokerSetGlobal(HelicsBroker broker, const char* valueName, const cha
     brk->setGlobal(valueName, AS_STRING_VIEW(value));
 }
 
+static constexpr char invalidInterfaceName[] = "Interface name cannot be empty";
+static constexpr char invalidAliasName[] = "Alias cannot be empty";
+
+void helicsCoreAddAlias(HelicsCore core, const char* interfaceName, const char* alias, HelicsError* err)
+{
+    auto* cr = getCore(core, err);
+    if (cr == nullptr) {
+        return;
+    }
+    if (interfaceName == nullptr || strlen(interfaceName) == 0) {
+        assignError(err, HELICS_ERROR_INVALID_ARGUMENT, invalidInterfaceName);
+        return;
+    }
+    if (alias == nullptr || strlen(alias) == 0) {
+        assignError(err, HELICS_ERROR_INVALID_ARGUMENT, invalidAliasName);
+        return;
+    }
+    try {
+        cr->addAlias(interfaceName, alias);
+    }
+    // LCOV_EXCL_START
+    catch (...) {
+        helicsErrorHandler(err);
+    }
+    // LCOV_EXCL_STOP
+}
+
+void helicsBrokerAddAlias(HelicsBroker broker, const char* interfaceName, const char* alias, HelicsError* err)
+{
+    auto* brk = getBroker(broker, err);
+    if (brk == nullptr) {
+        return;
+    }
+    if (interfaceName == nullptr || strlen(interfaceName) == 0) {
+        assignError(err, HELICS_ERROR_INVALID_ARGUMENT, invalidInterfaceName);
+        return;
+    }
+    if (alias == nullptr || strlen(alias) == 0) {
+        assignError(err, HELICS_ERROR_INVALID_ARGUMENT, invalidAliasName);
+        return;
+    }
+    try {
+        brk->addAlias(interfaceName, alias);
+    }
+    // LCOV_EXCL_START
+    catch (...) {
+        helicsErrorHandler(err);
+    }
+    // LCOV_EXCL_STOP
+}
+
 void helicsBrokerSendCommand(HelicsBroker broker, const char* target, const char* command, HelicsError* err)
 {
     auto* brk = getBroker(broker, err);
diff --git a/tests/helics/shared_library/test-value-federate2.cpp b/tests/helics/shared_library/test-value-federate2.cpp
index 7078916918..ca977cb5f7 100644
--- a/tests/helics/shared_library/test-value-federate2.cpp
+++ b/tests/helics/shared_library/test-value-federate2.cpp
@@ -152,6 +152,89 @@ TEST_F(vfed2_tests, file_load)
     helicsFederateFree(vFed);
 }
 
+TEST(valuefederate, fedAlias)
+{
+    auto fi = helicsCreateFederateInfo();
+    helicsFederateInfoSetCoreType(fi, HELICS_CORE_TYPE_TEST, nullptr);
+    helicsFederateInfoSetCoreName(fi, "core_alias", nullptr);
+    helicsFederateInfoSetCoreInitString(fi, "-f 1 --autobroker", nullptr);
+    helicsFederateInfoSetFlagOption(fi,
+                                    HELICS_HANDLE_OPTION_CONNECTION_REQUIRED,
+                                    HELICS_TRUE,
+                                    nullptr);
+    auto Fed1 = helicsCreateValueFederate("vfed1", fi, nullptr);
+    helicsFederateInfoFree(fi);
+    helicsFederateRegisterGlobalPublication(
+        Fed1, "pub1", HELICS_DATA_TYPE_DOUBLE, "parsecs", nullptr);
+
+    helicsFederateAddAlias(Fed1, "pub1", "theBigPub", nullptr);
+
+    helicsFederateRegisterSubscription(Fed1, "theBigPub", nullptr, nullptr);
+
+    auto err = helicsErrorInitialize();
+    helicsFederateEnterExecutingMode(Fed1, &err);
+    EXPECT_EQ(err.error_code, 0);
+    helicsFederateDestroy(Fed1);
+}
+
+TEST(valuefederate, coreAlias)
+{
+    auto fi = helicsCreateFederateInfo();
+    helicsFederateInfoSetCoreType(fi, HELICS_CORE_TYPE_TEST, nullptr);
+    helicsFederateInfoSetCoreName(fi, "core_alias", nullptr);
+    helicsFederateInfoSetCoreInitString(fi, "-f 1 --autobroker", nullptr);
+    helicsFederateInfoSetFlagOption(fi,
+                                    HELICS_HANDLE_OPTION_CONNECTION_REQUIRED,
+                                    HELICS_TRUE,
+                                    nullptr);
+    auto Fed1 = helicsCreateValueFederate("vfed1", fi, nullptr);
+    auto cr = helicsFederateGetCore(Fed1, nullptr);
+    helicsFederateInfoFree(fi);
+    helicsFederateRegisterGlobalPublication(
+        Fed1, "pub1", HELICS_DATA_TYPE_DOUBLE, "parsecs", nullptr);
+
+    helicsCoreAddAlias(cr, "pub1", "theBigPub", nullptr);
+
+    helicsFederateRegisterSubscription(Fed1, "theBigPub", nullptr, nullptr);
+
+    auto err = helicsErrorInitialize();
+    helicsFederateEnterExecutingMode(Fed1, &err);
+    EXPECT_EQ(err.error_code, 0);
+    helicsFederateDestroy(Fed1);
+    helicsCoreDestroy(cr);
+}
+
+TEST(valuefederate, brokerAlias)
+{
+    auto brk = helicsCreateBroker("test", "alias_broker", "-f1", nullptr);
+    auto fi = helicsCreateFederateInfo();
+    helicsFederateInfoSetCoreType(fi, HELICS_CORE_TYPE_TEST, nullptr);
+    helicsFederateInfoSetCoreName(fi, "core_alias", nullptr);
+    helicsFederateInfoSetCoreInitString(fi, "-f 1 --broker=alias_broker", nullptr);
+    helicsFederateInfoSetFlagOption(fi,
+                                    HELICS_HANDLE_OPTION_CONNECTION_REQUIRED,
+                                    HELICS_TRUE,
+                                    nullptr);
+    auto Fed1 = helicsCreateValueFederate("vfed1", fi, nullptr);
+
+    helicsFederateInfoFree(fi);
+    helicsFederateRegisterGlobalPublication(
+        Fed1, "pub1", HELICS_DATA_TYPE_DOUBLE, "parsecs", nullptr);
+
+    helicsBrokerAddAlias(brk, "pub1", "theBigPub", nullptr);
+
+    helicsFederateRegisterSubscription(Fed1, "theBigPub", nullptr, nullptr);
+
+    auto err = helicsErrorInitialize();
+    helicsFederateEnterExecutingMode(Fed1, &err);
+    EXPECT_EQ(err.error_code, 0);
+    helicsFederateDestroy(Fed1);
+    auto res = helicsBrokerWaitForDisconnect(brk, 1000, &err);
+    EXPECT_EQ(err.error_code, 0);
+    EXPECT_EQ(res, HELICS_TRUE);
+    helicsBrokerDestroy(brk);
+}
+
 static void stateChangeCallback(HelicsFederateState newState,
                                 HelicsFederateState /*oldState*/,
                                 void* userData)

From 4468ac00993e4a02b518fed114ffda235cad98c0 Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Fri, 21 Oct 2022 11:14:27 -0700
Subject: [PATCH 15/16] V3 3 1 release update (#2453)

* Update documents and version numbers for a 3.3.1 release.

* update roadmap

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add additional warning on in source builds

* ignore backup files

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update CHANGELOG.md

* Apply suggestions from code review

Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ryan Mast <3969255+nightlark@users.noreply.github.com>
---
 .gitignore                          |  3 +++
 CHANGELOG.md                        | 36 +++++++++++++++++++++++++----
 CMakeLists.txt                      |  4 ++--
 appveyor.yml                        |  2 +-
 config/cmake/commonBuildPaths.cmake |  6 +++++
 docs/ROADMAP.md                     | 15 ++++++++----
 vcpkg.json                          |  2 +-
 7 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7852fcaf8d..7dc1329302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -257,3 +257,6 @@ tags
 *.mex*
 .DS_Store
 HELICS_xcode
+
+### Backup files
+*.bak
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f2f6c6c94..4deb89127c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,35 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 A note on future revisions.
 Everything within a major version number should be code compatible (with the exception of experimental interfaces). The most notable example of an experimental interface is the support for multiple source inputs. The APIs to deal with this will change in future minor releases. Everything within a single minor release should be network compatible with other federates on the same minor release number. Compatibility across minor release numbers may be possible in some situations but we are not going to guarantee this as those components are subject to performance improvements and may need to be modified at some point. Patch releases will be limited to bug fixes and other improvements not impacting the public API or network compatibility. Check the [Public API](./docs/Public_API.md) for details on what is included and excluded from the public API and version stability.
 
-## [3.3.0][] ~ 2022-08-07
+## [3.3.1][] ~ 2022-10-21
+
+Patch release to fix some issues with using HELICS as a subproject, and fix a few bugs related to time barriers, and a few other timing issues.
+
+### Fixed
+
+- Fixed an issue where broker based time barriers were not propagating to new federates.
+- Fix the code coverage build system.
+- Fixed a potential race condition with callback federates if the callback operations are modified during cosimulation.
+- Fixed timing synchronization issue with global time coordinator.
+
+### Changed
+
+- Cleaned up usage of HELICS in external subprojects and adding some cleanup features, also cleanup the CMake usage to divide some operations into included files to simplify the main CMakeLists.txt
+- Changed the default behavior for profiler output files to create a new file instead of appending. Use `--profiler_append=<file>` to maintain the old behavior.
+
+### Added
+
+- Added single thread federate support which includes a federate optimized for use in a single thread.(Corresponding single thread core will come in next release).
+- Added support for initialization iteration to allow federates to specify ready and then return to the created mode to do additional initialization potentially with information from other federates.
+- Added flag to disable remote termination commands.
+- Added C API function calls for alias operations.
+- Added read only property HELICS_PROPERTY_INT_ITERATION_COUNT to get the current iteration count for a federate.
+
+### Removed
+
+- Removed an unused and unexposed method in the Core API to retrieve the current iteration count, use HELICS_PROPERTY_INT_ITERATION_COUNT with getProperty to retrieve the same data.
+
+## [3.3.0][] - 2022-09-15
 
 Minimum build requirements updated to CMake 3.11, Visual Studio 2019, XCode 11.0, GCC 8.1, Clang 7.0.
 The major new features include a callback federate, and aliases to allow interfaces to have multiple string names.
@@ -55,13 +83,11 @@ The release also includes several bug fixes related to timing and iteration.
 - Added a [callback Federate](https://docs.helics.org/en/latest/user-guide/advanced_topics/CallbackFederate.html) capability which allows a large number of callback based federates to execute on a single core without direct user calls
 - Added some additional [callbacks](https://docs.helics.org/en/latest/user-guide/advanced_topics/callbacks.html) for federates
 - Added flags on the webserver to allow much easier configuration to external network interfaces
-- Added read only property HELICS_PROPERTY_INT_ITERATION_COUNT to get the current iteration count for a federate
 
 ### Removed
 
 - ghc::filesystem, since all minimum compilers have support for std::filesystem available.
 - Removed Travis CI related configuration and documentation
-- Removed an unused and unexposed method in the Core API to retrieve the current iteration count, use HELICS_PROPERTY_INT_ITERATION_COUNT with getProperty to retrieve the same data.
 
 ## [3.2.1][] - 2022-06-17
 
@@ -292,6 +318,8 @@ HELICS 3.0 is a major update to HELICS. The major features that have been added
 [3.1.1]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.1.1
 [3.1.2]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.1.2
 [3.2.0]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.2.0
-[3.2.1]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.2.0
+[3.2.1]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.2.1
+[3.3.0]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.3.0
+[3.3.1]: https://github.com/GMLC-TDC/HELICS/releases/tag/v3.3.1
 
 The changelog for HELICS 1.X and 2.X can be found [here](./docs/HELICS2_CHANGELOG.md)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec82d80c57..29d2757f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,14 +17,14 @@ if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE AND NOT HELICS_D
     set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
 endif()
 
-project(HELICS VERSION 3.3.0)
+project(HELICS VERSION 3.3.1)
 
 # -----------------------------------------------------------------------------
 # HELICS Version number
 # -----------------------------------------------------------------------------
 set(HELICS_VERSION_BUILD)
 # use ISO date YYYY-MM-DD
-set(HELICS_DATE "2022-10-09")
+set(HELICS_DATE "2022-10-21")
 
 set(HELICS_VERSION_UNDERSCORE
     "${HELICS_VERSION_MAJOR}_${HELICS_VERSION_MINOR}_${HELICS_VERSION_PATCH}"
diff --git a/appveyor.yml b/appveyor.yml
index c8aebf3952..94ae5d604f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ branches:
     - main
     - develop
 
-version: 3.3.0.{build}
+version: 3.3.1.{build}
 
 image: Visual Studio 2019
 
diff --git a/config/cmake/commonBuildPaths.cmake b/config/cmake/commonBuildPaths.cmake
index 011833aec2..e56137184b 100644
--- a/config/cmake/commonBuildPaths.cmake
+++ b/config/cmake/commonBuildPaths.cmake
@@ -86,6 +86,12 @@ endif()
 
 # Prohibit in-source build
 if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
+    if(EXISTS "${PROJECT_SOURCE_DIR}/CMakeCache.txt")
+        message(
+            WARNING
+                "The source directory ${PROJECT_SOURCE_DIR} contains CMakeCache.txt and possibly other cmake folders like CMakeFiles that might interfere with the current build"
+        )
+    endif()
     message(
         FATAL_ERROR
             "In-source build is not supported. Please, use an empty directory for building the project."
diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md
index 10eb3ea814..43e5108489 100644
--- a/docs/ROADMAP.md
+++ b/docs/ROADMAP.md
@@ -2,15 +2,11 @@
 
 This document contains tentative plans for changes and improvements of note in upcoming versions of the HELICS library. All dates are approximate and subject to change, but this is a snapshot of the current planning thoughts. See the [projects](https://github.com/GMLC-TDC/HELICS/projects) for additional details
 
-## \[3.4\] ~ Late October 2022
+## \[3.4\] ~ November 2022
 
 - Full xSDK compatibility
 - Full Dynamic Federation support
 - Single thread cores
-- Iteration for entering initializing mode
-- Enable data aggregation
-- Wildcard support for subscribing
-- Catchall interface of some type
 - Separate Java Interface
 - Observer App
 
@@ -20,3 +16,12 @@ This document contains tentative plans for changes and improvements of note in u
 - Enable mesh networking in HELICS
 - Separate octave interface
 - Tag based subscriptions
+- Enable data aggregation
+- Wildcard support for subscriptions
+- Catchall interface of some type
+
+## Further in the future
+
+- Updated MPI core
+- Some sort of rollback operations
+- Remote procedure call type of federate
diff --git a/vcpkg.json b/vcpkg.json
index 7907147c7f..8663d45220 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "helics",
-  "version-string": "3.3.0",
+  "version-string": "3.3.1",
   "description": "Hierarchical Engine for Large-scale Infrastructure Co-Simulation (HELICS)",
   "homepage": "https://helics.org/",
   "default-features": ["zeromq", "ipc", "webserver", "encryption"],

From 8304195a95df2ca62d6be057168e5fa8ed7505ff Mon Sep 17 00:00:00 2001
From: Philip Top <top1@llnl.gov>
Date: Fri, 21 Oct 2022 14:46:51 -0700
Subject: [PATCH 16/16] tweak the GlobalTimeCoordinator  (#2450)

* tweak the GlobalTimeCoordinator a bit to try to resolve some lingering test issues

for more information, see https://pre-commit.ci

* remove cleanup statement from register functions

* update the concurrency library with delayedDestructor mods

* update concurrency library and debug some filterTests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix test fixtures for Cpp shared tests

* update concurrency library

* try running with much bigger timeout

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .ci/azure-pipelines.yml                             |  2 +-
 ThirdParty/concurrency                              |  2 +-
 scripts/run-ci-tests.sh                             |  4 ++--
 src/helics/core/CoreFactory.cpp                     |  1 -
 src/helics/core/GlobalTimeCoordinator.cpp           | 13 ++++++++++++-
 src/helics/core/GlobalTimeCoordinator.hpp           |  9 ++++-----
 .../application_api/FilterAdditionalTests.cpp       |  1 +
 tests/helics/application_api/FilterTests.cpp        |  5 +++++
 tests/helics/application_api/LoggingTests.cpp       |  2 ++
 .../MessageFederateAdditionalTests.cpp              |  1 +
 tests/helics/application_api/testFixtures.cpp       | 11 +++++++++--
 .../helics/application_api/testFixtures_shared.hpp  |  1 +
 12 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index 5f9d4e9787..2995719f26 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -197,7 +197,7 @@ jobs:
       # -----------------------
       # Test HELICS
       # -----------------------
-      - bash: ctest --output-on-failure --timeout 480 -C Release -L "Continuous"
+      - bash: ctest --output-on-failure --timeout 1000 -C Release -L "Continuous"
         displayName: 'Test HELICS'
         workingDirectory: build
 
diff --git a/ThirdParty/concurrency b/ThirdParty/concurrency
index 0783d98b5f..1bed77b9a9 160000
--- a/ThirdParty/concurrency
+++ b/ThirdParty/concurrency
@@ -1 +1 @@
-Subproject commit 0783d98b5fe4968972be6870e7a0526ad46abc38
+Subproject commit 1bed77b9a976f46df964b27f589cc965600ee3cc
diff --git a/scripts/run-ci-tests.sh b/scripts/run-ci-tests.sh
index a95e5f01ff..11ffc23aba 100755
--- a/scripts/run-ci-tests.sh
+++ b/scripts/run-ci-tests.sh
@@ -95,11 +95,11 @@ else
             ;;
         *continuous*)
             TEST_CONFIG="Continuous"
-            CTEST_OPTIONS+=" --timeout 600"
+            CTEST_OPTIONS+=" --timeout 1000"
             ;;
         *ci*)
             TEST_CONFIG="Continuous"
-            CTEST_OPTIONS+=" --timeout 600"
+            CTEST_OPTIONS+=" --timeout 1000"
             ;;
         *)
             # Use whatever user gave for TEST_CONFIG
diff --git a/src/helics/core/CoreFactory.cpp b/src/helics/core/CoreFactory.cpp
index ac29a4271d..dab6ddc768 100644
--- a/src/helics/core/CoreFactory.cpp
+++ b/src/helics/core/CoreFactory.cpp
@@ -338,7 +338,6 @@ bool registerCore(const std::shared_ptr<Core>& core, CoreType type)
     if (core) {
         res = searchableCores.addObject(cname, core, type);
     }
-    cleanUpCores();
     if (res) {
         delayedDestroyer.addObjectsToBeDestroyed(core);
         addExtraTypes(cname, type);
diff --git a/src/helics/core/GlobalTimeCoordinator.cpp b/src/helics/core/GlobalTimeCoordinator.cpp
index fb238f94ca..40ca2deebc 100644
--- a/src/helics/core/GlobalTimeCoordinator.cpp
+++ b/src/helics/core/GlobalTimeCoordinator.cpp
@@ -88,6 +88,7 @@ bool GlobalTimeCoordinator::updateTimeFactors()
             nextEvent = findNextTriggerEvent(dependencies);
             ++sequenceCounter;
             auto trigTime = (nextEvent < cBigTime) ? nextEvent + Time::epsilon() : nextEvent;
+            mNewRequest = false;
             sendTimeUpdateRequest(trigTime);
             return true;
         }
@@ -102,8 +103,9 @@ bool GlobalTimeCoordinator::updateTimeFactors()
                     verified = dependencies.verifySequenceCounter(trigTime, sequenceCounter);
                 }
 
-                if (trig.first || !verified) {
+                if (trig.first || !verified || mNewRequest) {
                     ++sequenceCounter;
+                    mNewRequest = false;
                     sendTimeUpdateRequest(trigTime);
                     return true;
                 }
@@ -151,6 +153,15 @@ bool GlobalTimeCoordinator::updateTimeFactors()
     return true;
 }
 
+TimeProcessingResult GlobalTimeCoordinator::processTimeMessage(const ActionMessage& cmd)
+{
+    auto res = BaseTimeCoordinator::processTimeMessage(cmd);
+    if (res == TimeProcessingResult::PROCESSED_NEW_REQUEST) {
+        mNewRequest = true;
+    }
+    return res;
+}
+
 void GlobalTimeCoordinator::generateDebuggingTimeInfo(Json::Value& base) const
 {
     base["type"] = "global";
diff --git a/src/helics/core/GlobalTimeCoordinator.hpp b/src/helics/core/GlobalTimeCoordinator.hpp
index b188b02988..1101a82198 100644
--- a/src/helics/core/GlobalTimeCoordinator.hpp
+++ b/src/helics/core/GlobalTimeCoordinator.hpp
@@ -28,10 +28,12 @@ class GlobalTimeCoordinator: public BaseTimeCoordinator {
     Time currentMinTime{Time::minVal()};
     TimeState currentTimeState{TimeState::initialized};
     Time nextEvent{Time::maxVal()};
+    static constexpr std::int32_t mSequenceIncrement{100};
 
   protected:
     bool iterating{false};  //!< flag indicating that the min dependency is iterating
-
+    bool mNewRequest{
+        true};  //!< flag indicating a new request has been received since the last sequence Update
   public:
     GlobalTimeCoordinator() = default;
 
@@ -48,16 +50,13 @@ class GlobalTimeCoordinator: public BaseTimeCoordinator {
     void sendTimeUpdateRequest(Time triggerTime);
 
   public:
-    /** check if entry to the executing state can be granted*/
+    virtual TimeProcessingResult processTimeMessage(const ActionMessage& cmd) override;
     virtual MessageProcessingResult
         checkExecEntry(GlobalFederateId triggerFed = GlobalFederateId{}) override;
 
-    /** generate a string with the current time status*/
     virtual std::string printTimeStatus() const override;
-    /** generate debugging time information*/
     virtual void generateDebuggingTimeInfo(Json::Value& base) const override;
 
-    /** get the current next time*/
     virtual Time getNextTime() const override { return currentMinTime; }
 };
 }  // namespace helics
diff --git a/tests/helics/application_api/FilterAdditionalTests.cpp b/tests/helics/application_api/FilterAdditionalTests.cpp
index cd2f7b8332..5a02e96c8f 100644
--- a/tests/helics/application_api/FilterAdditionalTests.cpp
+++ b/tests/helics/application_api/FilterAdditionalTests.cpp
@@ -158,6 +158,7 @@ endpoint only if condition matches.
 */
 TEST_P(filter_type_tests, message_reroute_filter_condition)
 {
+    debugDiagnostic = true;
     auto broker = AddBroker(GetParam(), 2);
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "filter");
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "message");
diff --git a/tests/helics/application_api/FilterTests.cpp b/tests/helics/application_api/FilterTests.cpp
index 6e288fb0ae..04dad36d1b 100644
--- a/tests/helics/application_api/FilterTests.cpp
+++ b/tests/helics/application_api/FilterTests.cpp
@@ -44,6 +44,7 @@ class filter: public ::testing::Test, public FederateTestFixture {};
 /** test registration of filters*/
 TEST_P(filter_single_type_test, message_filter_registration)
 {
+    debugDiagnostic = true;
     auto broker = AddBroker(GetParam(), 2);
 
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, helics::timeZero, "filter");
@@ -347,6 +348,7 @@ simulation
 
 TEST_P(filter_single_type_test, message_dest_filter_object)
 {
+    debugDiagnostic = true;
     auto broker = AddBroker(GetParam(), 2);
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "filter");
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "message");
@@ -531,6 +533,7 @@ TEST_P(filter_single_type_test, message_filter_function_two_stage)
 
 TEST_P(filter_single_type_test, message_filter_function_two_stage_endpoint_target)
 {
+    debugDiagnostic = true;
     auto broker = AddBroker(GetParam(), 3);
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "filter");
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "filter2");
@@ -559,6 +562,7 @@ TEST_P(filter_single_type_test, message_filter_function_two_stage_endpoint_targe
 
 TEST_F(filter, message_filter_function_two_stage_endpoint_target_alias)
 {
+    debugDiagnostic = true;
     auto broker = AddBroker("test", 3);
     AddFederates<helics::MessageFederate>("test", 1, broker, 1.0, "filter");
     AddFederates<helics::MessageFederate>("test", 1, broker, 1.0, "filter2");
@@ -589,6 +593,7 @@ TEST_F(filter, message_filter_function_two_stage_endpoint_target_alias)
 
 TEST_P(filter_single_type_test, message_filter_function_two_stage_endpoint_target_dest)
 {
+    debugDiagnostic = true;
     auto broker = AddBroker(GetParam(), 3);
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "filter");
     AddFederates<helics::MessageFederate>(GetParam(), 1, broker, 1.0, "filter2");
diff --git a/tests/helics/application_api/LoggingTests.cpp b/tests/helics/application_api/LoggingTests.cpp
index 5f25a5fd8e..640f278bf2 100644
--- a/tests/helics/application_api/LoggingTests.cpp
+++ b/tests/helics/application_api/LoggingTests.cpp
@@ -872,6 +872,7 @@ TEST(logging, log_buffer_core2)
     EXPECT_GE(js2["logs"].size(), 1U);
     EXPECT_LE(js2["logs"].size(), 3U);
     cr.reset();
+    helics::cleanupHelicsLibrary();
 }
 
 TEST(logging, remote_log_broker)
@@ -906,6 +907,7 @@ TEST(logging, remote_log_broker)
     }
     llock.unlock();
     EXPECT_GT(remote_cnt, 0);
+    helics::cleanupHelicsLibrary();
 }
 
 TEST(logging, remote_log_fed)
diff --git a/tests/helics/application_api/MessageFederateAdditionalTests.cpp b/tests/helics/application_api/MessageFederateAdditionalTests.cpp
index c0fe5e727b..ec4b24cee0 100644
--- a/tests/helics/application_api/MessageFederateAdditionalTests.cpp
+++ b/tests/helics/application_api/MessageFederateAdditionalTests.cpp
@@ -112,6 +112,7 @@ TEST_P(mfed_add_single_type_tests, endpoint_registration_objs)
 
 TEST_P(mfed_add_single_type_tests, send_receive_callback)
 {
+    debugDiagnostic = true;
     SetupTest<helics::MessageFederate>(GetParam(), 1);
     auto mFed1 = GetFederateAs<helics::MessageFederate>(0);
 
diff --git a/tests/helics/application_api/testFixtures.cpp b/tests/helics/application_api/testFixtures.cpp
index 79755663dc..5222a6bec4 100644
--- a/tests/helics/application_api/testFixtures.cpp
+++ b/tests/helics/application_api/testFixtures.cpp
@@ -92,9 +92,16 @@ FederateTestFixture::~FederateTestFixture()
     }
     federates.clear();
     if (debugDiagnostic) {
-        std::cout << "cleanup" << std::endl;
+        using namespace std::chrono_literals;  // NOLINT
+        std::cout << "cleanup1" << std::endl;
+        helics::BrokerFactory::cleanUpBrokers(100ms);
+        std::cout << "cleanup2" << std::endl;
+        helics::CoreFactory::cleanUpCores(200ms);
+        std::cout << "cleanup3" << std::endl;
+        helics::BrokerFactory::cleanUpBrokers(100ms);
+    } else {
+        helics::cleanupHelicsLibrary();
     }
-    helics::cleanupHelicsLibrary();
     if (debugDiagnostic) {
         std::cout << "finished" << std::endl;
     }
diff --git a/tests/helics/application_api/testFixtures_shared.hpp b/tests/helics/application_api/testFixtures_shared.hpp
index 3f68f9ac6e..d7d292217f 100644
--- a/tests/helics/application_api/testFixtures_shared.hpp
+++ b/tests/helics/application_api/testFixtures_shared.hpp
@@ -215,4 +215,5 @@ struct FederateTestFixture {
     std::string extraBrokerArgs;
     std::string extraFederateArgs;
     std::string ctype;
+    bool debugDiagnostic{false};
 };